Merge remote-tracking branch 'origin/master'
authorDavid Bremner <bremner@debian.org>
Fri, 24 Jun 2011 00:54:50 +0000 (21:54 -0300)
committerDavid Bremner <bremner@debian.org>
Fri, 24 Jun 2011 00:54:50 +0000 (21:54 -0300)

Trivial merge