Merge commit '2.13' into HEAD
authorBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 03:34:39 +0000 (03:34 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 03:34:39 +0000 (03:34 +0000)

Trivial merge