Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 14:56:51 +0000 (08:56 -0600)
committerJean-Philippe Caissy <jean-philippe.caissy@auf.org>
Thu, 26 Jan 2012 14:56:51 +0000 (08:56 -0600)

Trivial merge