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

Trivial merge