Merge nmbug.tethera.net:nmbug-tags
authorDavid Edmondson <dme@dme.org>
Wed, 18 Jan 2012 12:59:24 +0000 (12:59 +0000)
committerDavid Edmondson <dme@dme.org>
Wed, 18 Jan 2012 12:59:24 +0000 (12:59 +0000)

Trivial merge