Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 10 Feb 2012 18:52:09 +0000 (12:52 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Fri, 10 Feb 2012 18:52:09 +0000 (12:52 -0600)

Trivial merge