Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev
authorDavin Baragiotta <davin.baragiotta@auf.org>
Fri, 1 Jun 2012 19:43:41 +0000 (15:43 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Fri, 1 Jun 2012 19:43:41 +0000 (15:43 -0400)

Trivial merge