From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 16 Dec 2009 20:09:55 +0000 (+0100)
Subject: Merge commit 'origin/stable'
X-Git-Tag: fc11-i386-build58^0
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=3bbb4370239deb29ebbf813d258aef6249e2a431;hp=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp-builds.git

Merge commit 'origin/stable'

Conflicts:

	NEWS
	configure.ac
	po/nl.po
	src/ui/gui/dict-display.c
---