From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 22 Apr 2009 09:15:41 +0000 (+0800)
Subject: Merge commit 'origin/stable'
X-Git-Tag: v0.7.3~142
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e0e4996fad6563f0a1ce628b80db5c23ef8279e;p=pspp-builds.git

Merge commit 'origin/stable'

Conflicts:

	src/ui/gui/output-viewer.c
---

9e0e4996fad6563f0a1ce628b80db5c23ef8279e