Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 16 Feb 2012 22:09:49 +0000 (16:09 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Thu, 16 Feb 2012 22:09:49 +0000 (16:09 -0600)

Trivial merge