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

Trivial merge