Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sun, 11 Mar 2012 01:46:26 +0000 (21:46 -0400)
committerDavid Bremner <bremner@debian.org>
Sun, 11 Mar 2012 01:46:26 +0000 (21:46 -0400)

Trivial merge