Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Mon, 1 Aug 2011 19:58:07 +0000 (21:58 +0200)
committerDavid Bremner <bremner@debian.org>
Mon, 1 Aug 2011 19:58:07 +0000 (21:58 +0200)

Trivial merge