Merge remote-tracking branch 'origin/master' into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 16:49:24 +0000 (10:49 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 8 Mar 2012 16:49:24 +0000 (10:49 -0600)

Trivial merge