Merge branch 'rh' of ssh://git.auf/auf_rh_dae into rh
authordavin baragiotta <davin.baragiotta@u-db.(none)>
Mon, 16 May 2011 18:28:43 +0000 (14:28 -0400)
committerDavin BARAGIOTTA <davin.baragiotta@auf.org>
Mon, 16 May 2011 18:28:43 +0000 (14:28 -0400)

Trivial merge