Merge branch 'svn'
authorMark Wooding <mdw@distorted.org.uk>
Mon, 13 Feb 2006 11:55:44 +0000 (11:55 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 13 Feb 2006 11:55:44 +0000 (11:55 +0000)

Trivial merge