Merge commit '1.0.0.2ds2' into HEAD
authorBen Hutchings <ben@decadent.org.uk>
Mon, 3 Nov 2008 00:35:11 +0000 (00:35 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Mon, 3 Nov 2008 00:35:11 +0000 (00:35 +0000)

Trivial merge