Merge branch 'master' into psppsheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 25 Aug 2012 17:01:45 +0000 (19:01 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 25 Aug 2012 17:01:45 +0000 (19:01 +0200)

Trivial merge