Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 12 Mar 2012 15:59:15 +0000 (10:59 -0500)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Mon, 12 Mar 2012 15:59:15 +0000 (10:59 -0500)

Trivial merge