Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Thu, 13 Sep 2012 12:34:07 +0000 (09:34 -0300)
committerDavid Bremner <bremner@unb.ca>
Thu, 13 Sep 2012 12:34:07 +0000 (09:34 -0300)

Trivial merge