Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Tue, 7 Feb 2012 19:33:43 +0000 (14:33 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Tue, 7 Feb 2012 19:33:43 +0000 (14:33 -0500)

Trivial merge