Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Wed, 23 Nov 2011 20:02:47 +0000 (16:02 -0400)
committerDavid Bremner <bremner@debian.org>
Wed, 23 Nov 2011 20:02:47 +0000 (16:02 -0400)

Trivial merge