Merge nmbug.tethera.net:nmbug-tags
authorDavid Edmondson <dme@dme.org>
Mon, 30 Jan 2012 10:10:49 +0000 (10:10 +0000)
committerDavid Edmondson <dme@dme.org>
Mon, 30 Jan 2012 15:35:33 +0000 (15:35 +0000)

Trivial merge