Merge commit 'debian/1.0.7-2'
authorBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 03:03:30 +0000 (04:03 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Jul 2010 03:03:30 +0000 (04:03 +0100)
Conflicts:
debian/changelog


Trivial merge