Merge branch 'dev' of ssh://git.auf/auf_rh_dae into dev 1.7.1
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 18 Mar 2013 15:25:50 +0000 (11:25 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 18 Mar 2013 15:25:50 +0000 (11:25 -0400)

Trivial merge