Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
authorJohn Darrington <john@marilyn.intra>
Mon, 15 Sep 2008 10:05:04 +0000 (18:05 +0800)
committerJohn Darrington <john@marilyn.intra>
Mon, 15 Sep 2008 10:05:04 +0000 (18:05 +0800)
Conflicts:

po/en_GB.po


Trivial merge