Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Mon, 3 Mar 2014 12:29:50 +0000 (08:29 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 3 Mar 2014 12:29:50 +0000 (08:29 -0400)

Trivial merge