Merge nmbug.tethera.net:nmbug-tags
authorDavid Bremner <bremner@unb.ca>
Mon, 16 Jan 2012 20:33:12 +0000 (16:33 -0400)
committerDavid Bremner <bremner@unb.ca>
Mon, 16 Jan 2012 20:33:12 +0000 (16:33 -0400)

Trivial merge