Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 8 Feb 2012 20:56:46 +0000 (14:56 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 8 Feb 2012 20:56:46 +0000 (14:56 -0600)

Trivial merge