Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 16 Feb 2012 20:13:06 +0000 (15:13 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 16 Feb 2012 20:13:06 +0000 (15:13 -0500)

Trivial merge