Merge nmbug.tethera.net:nmbug-tags
authorAustin Clements <amdragon@mit.edu>
Sun, 22 Apr 2012 16:11:00 +0000 (12:11 -0400)
committerAustin Clements <amdragon@mit.edu>
Sun, 22 Apr 2012 16:11:00 +0000 (12:11 -0400)

Trivial merge