Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorOlivier Larchevêque <olivier.larcheveque@gmail.com>
Fri, 5 Aug 2011 23:09:55 +0000 (19:09 -0400)
committerOlivier Larchevêque <olivier.larcheveque@gmail.com>
Fri, 5 Aug 2011 23:09:55 +0000 (19:09 -0400)

Trivial merge