Merge branch 'refs/heads/charset' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into charset
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 29 Mar 2009 23:59:42 +0000 (07:59 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 29 Mar 2009 23:59:42 +0000 (07:59 +0800)

Trivial merge