Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 00:02:55 +0000 (18:02 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Fri, 3 Feb 2012 00:02:55 +0000 (18:02 -0600)

Trivial merge