Merge in a few Debian commits.
authorDavid Bremner <david@tethera.net>
Thu, 8 May 2014 21:38:42 +0000 (06:38 +0900)
committerDavid Bremner <david@tethera.net>
Thu, 8 May 2014 21:38:42 +0000 (06:38 +0900)

Trivial merge