Merge ssh://pivot.cs.unb.ca/pub/nmbug
authorSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 6 Dec 2011 13:04:02 +0000 (14:04 +0100)
committerSebastian Spaeth <Sebastian@SSpaeth.de>
Tue, 6 Dec 2011 13:04:02 +0000 (14:04 +0100)

Trivial merge