Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 7 Mar 2012 16:53:15 +0000 (10:53 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Wed, 7 Mar 2012 16:53:15 +0000 (10:53 -0600)

Trivial merge