Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sat, 10 Sep 2011 13:11:25 +0000 (10:11 -0300)
committerDavid Bremner <bremner@debian.org>
Sat, 10 Sep 2011 13:11:25 +0000 (10:11 -0300)

Trivial merge