Merge branch 'master' of pivot.cs.unb.ca:pub/nmbug
authorDavid Bremner <bremner@unb.ca>
Thu, 10 Nov 2011 20:06:07 +0000 (15:06 -0500)
committerDavid Bremner <bremner@unb.ca>
Thu, 10 Nov 2011 20:06:07 +0000 (15:06 -0500)

Trivial merge