Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Tue, 22 Jan 2013 12:58:26 +0000 (08:58 -0400)
committerDavid Bremner <bremner@unb.ca>
Tue, 22 Jan 2013 12:58:26 +0000 (08:58 -0400)

Trivial merge