Merge http://nmbug.tethera.net/git/nmbug-tags
authorDavid Bremner <david@tethera.net>
Thu, 6 Mar 2014 17:01:23 +0000 (13:01 -0400)
committerDavid Bremner <david@tethera.net>
Thu, 6 Mar 2014 17:01:23 +0000 (13:01 -0400)

Trivial merge