upstream/4.6_git20110822

Vincent Legout

@vlegout

dd2c48ce · Imported Upstream version 4.6~git20110822 · Aug 24, 2011

Upstream version 4.6~git20110822