Merge branch 'release/1.6.5'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 25 Feb 2013 15:19:10 +0000 (10:19 -0500)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 25 Feb 2013 15:19:10 +0000 (10:19 -0500)

Trivial merge