Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Thu, 27 Sep 2012 16:01:05 +0000 (13:01 -0300)
committerDavid Bremner <bremner@unb.ca>
Thu, 27 Sep 2012 16:01:05 +0000 (13:01 -0300)

Trivial merge