Merge remote branch 'origin/dev' into dae
authorNicolas Cadou <ncadou@cadou.ca>
Wed, 6 Apr 2011 23:33:56 +0000 (19:33 -0400)
committerNicolas Cadou <ncadou@cadou.ca>
Wed, 6 Apr 2011 23:33:56 +0000 (19:33 -0400)

Trivial merge