Merge git://pivot.cs.unb.ca/nmbug
authorDavid Edmondson <dme@dme.org>
Thu, 22 Dec 2011 13:41:58 +0000 (13:41 +0000)
committerDavid Edmondson <dme@dme.org>
Thu, 22 Dec 2011 13:41:58 +0000 (13:41 +0000)

Trivial merge