Merge remote branch 'ysuarez/master'
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 19 May 2011 12:42:06 +0000 (08:42 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 19 May 2011 12:42:06 +0000 (08:42 -0400)

Trivial merge