Merge branch 'dev', remote-tracking branch 'origin' into test
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 5 Apr 2012 16:22:28 +0000 (11:22 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 5 Apr 2012 16:22:28 +0000 (11:22 -0500)

Trivial merge