Merge remote branch 'ysuarez/master'
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Fri, 3 Jun 2011 17:31:15 +0000 (13:31 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Fri, 3 Jun 2011 17:31:15 +0000 (13:31 -0400)

Trivial merge