Merge nmbug.tethera.net:nmbug-tags
authorAustin Clements <amdragon@mit.edu>
Mon, 9 Jul 2012 21:53:44 +0000 (17:53 -0400)
committerAustin Clements <amdragon@mit.edu>
Mon, 9 Jul 2012 21:53:44 +0000 (17:53 -0400)

Trivial merge