Merge branch 'hotfix/dae_error_500'
authorBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Wed, 10 Apr 2013 17:55:49 +0000 (13:55 -0400)
committerBenoit C. Sirois <benoit.clennett-sirois@auf.org>
Wed, 10 Apr 2013 17:55:49 +0000 (13:55 -0400)

Trivial merge