Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 17:35:26 +0000 (13:35 -0400)
committerEric Mc Sween <eric.mcsween@auf.org>
Mon, 14 May 2012 17:35:26 +0000 (13:35 -0400)

Trivial merge