Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 15 Feb 2012 16:39:50 +0000 (10:39 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 15 Feb 2012 16:39:50 +0000 (10:39 -0600)

Trivial merge