Merge nmbug.tethera.net:nmbug-tags
authorAustin Clements <amdragon@mit.edu>
Mon, 30 Jan 2012 05:43:48 +0000 (00:43 -0500)
committerAustin Clements <amdragon@mit.edu>
Mon, 30 Jan 2012 05:43:48 +0000 (00:43 -0500)

Trivial merge