upstream/4.6_git20110618

Vincent Legout

@vlegout

16a81154 · Imported Upstream version 4.6~git20110618 · Jun 18, 2011

Upstream version 4.6~git20110618