Merge nmbug.tethera.net:nmbug-tags
authorEthan Glasser-Camp <ethan@betacantrips.com>
Mon, 22 Oct 2012 21:19:25 +0000 (17:19 -0400)
committerEthan Glasser-Camp <ethan@betacantrips.com>
Mon, 22 Oct 2012 21:19:25 +0000 (17:19 -0400)

Trivial merge