Merge branch 'hotfix/bug_abf' into dev
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 28 Mar 2013 17:06:33 +0000 (13:06 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Thu, 28 Mar 2013 17:06:33 +0000 (13:06 -0400)

Trivial merge