Merge remote-tracking branch 'origin/dev' into test
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 10 Apr 2012 21:03:58 +0000 (16:03 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 10 Apr 2012 21:03:58 +0000 (16:03 -0500)

Trivial merge