Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 14 May 2010 13:29:37 +0000 (15:29 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 14 May 2010 13:29:37 +0000 (15:29 +0200)

Trivial merge