Merge git+ssh://pivot.cs.unb.ca/pub/nmbug
authorDavid Bremner <bremner@unb.ca>
Tue, 6 Dec 2011 13:44:42 +0000 (09:44 -0400)
committerDavid Bremner <bremner@unb.ca>
Tue, 6 Dec 2011 13:44:42 +0000 (09:44 -0400)

Trivial merge