Merge branch 'master' of /home/john/Development/pspp-bare
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 10 Jan 2009 23:15:49 +0000 (08:15 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 10 Jan 2009 23:15:49 +0000 (08:15 +0900)

Trivial merge