upstream/4.6_git20110507

Vincent Legout

@vlegout

dad97a07 · Imported Upstream version 4.6~git20110507 · May 14, 2011

Upstream version 4.6~git20110507