From: Ben Pfaff <blp@gnu.org>
Date: Fri, 10 Oct 2008 05:49:13 +0000 (-0700)
Subject: Merge commit 'origin/stable'
X-Git-Tag: v0.7.1~50^2~39
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=015e221b0f8578afee769528572c76387f26c629

Merge commit 'origin/stable'

Conflicts:

	tests/automake.mk
---

015e221b0f8578afee769528572c76387f26c629