Merge branch 'master' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 11 Feb 2013 15:17:33 +0000 (10:17 -0500)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Mon, 11 Feb 2013 15:17:33 +0000 (10:17 -0500)

Trivial merge