Merge remote-tracking branch 'upstream/develop' into develop
authorJérémy Bethmont <jeremy.bethmont@gmail.com>
Tue, 9 Aug 2011 13:16:23 +0000 (15:16 +0200)
committerJérémy Bethmont <jeremy.bethmont@gmail.com>
Tue, 9 Aug 2011 13:16:23 +0000 (15:16 +0200)

Trivial merge