Merge branch 'dev' of ssh://git.auf.org/auf_rh_dae into dev
authorDavin Baragiotta <davin.baragiotta@auf.org>
Thu, 10 Nov 2011 19:12:32 +0000 (14:12 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Thu, 10 Nov 2011 19:12:32 +0000 (14:12 -0500)

Trivial merge