Merge nmbug.tethera.net:nmbug-tags
authorDavid Edmondson <dme@dme.org>
Wed, 25 Jan 2012 13:57:19 +0000 (13:57 +0000)
committerDavid Edmondson <dme@dme.org>
Wed, 25 Jan 2012 13:57:19 +0000 (13:57 +0000)

Trivial merge