Merge commit 'debian/1.0.6-3'
authorBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 02:51:44 +0000 (03:51 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 02:51:44 +0000 (03:51 +0100)

Trivial merge