merge from upstream
authorMark Hymers <mark@hymers.org.uk>
Wed, 26 Dec 2007 22:47:26 +0000 (22:47 +0000)
committerMark Hymers <mark@hymers.org.uk>
Wed, 26 Dec 2007 22:47:26 +0000 (22:47 +0000)

Trivial merge