Merge git+ssh://pivot.cs.unb.ca/pub/nmbug
authorDavid Bremner <bremner@unb.ca>
Thu, 8 Dec 2011 19:21:59 +0000 (15:21 -0400)
committerDavid Bremner <bremner@unb.ca>
Thu, 8 Dec 2011 19:21:59 +0000 (15:21 -0400)

Trivial merge