Merge pivot.cs.unb.ca:pub/nmbug
authorAustin Clements <amdragon@mit.edu>
Wed, 9 Nov 2011 13:48:20 +0000 (08:48 -0500)
committerAustin Clements <amdragon@mit.edu>
Wed, 9 Nov 2011 13:48:20 +0000 (08:48 -0500)

Trivial merge