Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <david@tethera.net>
Sat, 22 Feb 2014 23:57:44 +0000 (19:57 -0400)
committerDavid Bremner <david@tethera.net>
Sat, 22 Feb 2014 23:57:44 +0000 (19:57 -0400)

Trivial merge