Merge branch 'rh' of ssh://git.auf.org/auf_rh_dae into rh
authorDavin Baragiotta <davin.baragiotta@auf.org>
Wed, 16 Nov 2011 22:01:02 +0000 (17:01 -0500)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Wed, 16 Nov 2011 22:01:02 +0000 (17:01 -0500)

Trivial merge