Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 13 Dec 2009 19:39:35 +0000 (20:39 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 13 Dec 2009 19:39:35 +0000 (20:39 +0100)

Trivial merge