Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Fri, 13 Jan 2012 19:42:01 +0000 (15:42 -0400)
committerDavid Bremner <bremner@unb.ca>
Fri, 13 Jan 2012 19:42:01 +0000 (15:42 -0400)

Trivial merge