Merge nmbug.tethera.net:nmbug-tags
authorAustin Clements <amdragon@mit.edu>
Tue, 27 Mar 2012 22:03:41 +0000 (18:03 -0400)
committerAustin Clements <amdragon@mit.edu>
Tue, 27 Mar 2012 22:03:41 +0000 (18:03 -0400)

Trivial merge