From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 30 Dec 2012 03:21:39 +0000 (-0800)
Subject: Merge 'master' into 'psppsheet'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20130104032103%2Fpspp;p=pspp

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

6f3865480503c571963d8a2d1af858a4d72d4e88