Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 18 Nov 2009 19:41:06 +0000 (20:41 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 18 Nov 2009 19:41:06 +0000 (20:41 +0100)

Trivial merge