Merge branch 'master' of pivot.cs.unb.ca:pub/nmbug
authorDavid Bremner <bremner@unb.ca>
Tue, 29 Nov 2011 07:16:09 +0000 (23:16 -0800)
committerDavid Bremner <bremner@unb.ca>
Tue, 29 Nov 2011 07:16:09 +0000 (23:16 -0800)

Trivial merge