Merge commit 'debian/0.10.2-1' into squeeze-backports
authorDavid Bremner <bremner@debian.org>
Fri, 16 Dec 2011 20:46:20 +0000 (16:46 -0400)
committerDavid Bremner <bremner@debian.org>
Fri, 16 Dec 2011 20:46:20 +0000 (16:46 -0400)
commit90259bf961eeacb89dfd2e73526a931e530cabd8
treec8c5d57ebba3f82e372e8d2670257ac01d68fca4
parent8c0cb84ecce40ded56f9c551b2ef791caa9be7cf
parent07bb8b9e895541006eca88430925f1c6524c4708
Merge commit 'debian/0.10.2-1' into squeeze-backports

Conflicts:
debian/changelog
debian/changelog