Merge branch 'dev' of git.auf.org:auf_rh_dae into dev
authorEric Mc Sween <eric.mcsween@auf.org>
Wed, 18 Jan 2012 22:16:57 +0000 (17:16 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Wed, 18 Jan 2012 22:16:57 +0000 (17:16 -0500)

Trivial merge