Merge remote branch 'hcethatsme/master'
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Fri, 20 May 2011 02:40:07 +0000 (22:40 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Fri, 20 May 2011 02:40:07 +0000 (22:40 -0400)

Trivial merge