Merge commit '20081002' into HEAD
authorBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 12:49:40 +0000 (12:49 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 12:49:40 +0000 (12:49 +0000)

Trivial merge