Merge branch 'master' of ssh://john@cellform.com/home/john/Development/pspp-selector
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 13 Dec 2009 19:40:38 +0000 (20:40 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 13 Dec 2009 19:40:38 +0000 (20:40 +0100)

Trivial merge