Merge branch 'rel_2_1'
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Wed, 30 Nov 2011 20:25:00 +0000 (15:25 -0500)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Wed, 30 Nov 2011 20:25:00 +0000 (15:25 -0500)

Trivial merge