Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Tue, 31 Jan 2012 16:03:54 +0000 (10:03 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Tue, 31 Jan 2012 16:03:54 +0000 (10:03 -0600)

Trivial merge