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

Trivial merge