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

Trivial merge