Merge git+ssh://pivot.cs.unb.ca/pub/nmbug
authorDavid Bremner <bremner@unb.ca>
Tue, 22 Nov 2011 00:27:28 +0000 (20:27 -0400)
committerDavid Bremner <bremner@unb.ca>
Tue, 22 Nov 2011 00:27:28 +0000 (20:27 -0400)

Trivial merge