Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@gmail.com>
Tue, 9 Aug 2011 17:51:41 +0000 (13:51 -0400)
committerOlivier Larchevêque <olivier.larcheveque@gmail.com>
Tue, 9 Aug 2011 17:51:41 +0000 (13:51 -0400)

Trivial merge