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

Trivial merge