Merge branch 'release/1.7.1'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 18 Mar 2013 17:18:58 +0000 (13:18 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 18 Mar 2013 17:18:58 +0000 (13:18 -0400)

Trivial merge