Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 6 Mar 2012 21:25:14 +0000 (15:25 -0600)
committerJean-Philippe Caissy <jpcaissy@piji.ca>
Tue, 6 Mar 2012 21:25:14 +0000 (15:25 -0600)

Trivial merge