Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sat, 3 Mar 2012 15:56:36 +0000 (11:56 -0400)
committerDavid Bremner <bremner@debian.org>
Sat, 3 Mar 2012 15:56:36 +0000 (11:56 -0400)

Trivial merge