Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Thu, 13 Feb 2014 19:12:33 +0000 (15:12 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 13 Feb 2014 19:12:33 +0000 (15:12 -0400)

Trivial merge