Merge branch 'release/1.7'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 14 Mar 2013 14:20:47 +0000 (10:20 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 14 Mar 2013 14:20:47 +0000 (10:20 -0400)

Trivial merge