Merge nmbug.tethera.net:nmbug-tags
authorDavid Edmondson <dme@dme.org>
Mon, 16 Jan 2012 12:00:00 +0000 (12:00 +0000)
committerDavid Edmondson <dme@dme.org>
Mon, 16 Jan 2012 12:00:00 +0000 (12:00 +0000)

Trivial merge