Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Mon, 21 Nov 2011 11:26:11 +0000 (07:26 -0400)
committerDavid Bremner <bremner@debian.org>
Mon, 21 Nov 2011 11:26:11 +0000 (07:26 -0400)

Trivial merge