Merge branch 'hotfix' of ssh://git.auf.org/auf_rh_dae into hotfix
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 14 Mar 2012 14:58:53 +0000 (09:58 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 14 Mar 2012 14:58:53 +0000 (09:58 -0500)

Trivial merge