From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 6 Jan 2013 20:57:23 +0000 (-0800)
Subject: Merge 'master' into 'psppsheet'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20130111091005%2Fpspp;p=pspp

Merge 'master' into 'psppsheet'.
---

b3fcf4b1644bf4af9b5eb7b0b0f8856c51118128