Merge commit 'upstream/3.11.2' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:31:35 +0000 (18:31 +0100)
committerStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:31:35 +0000 (18:31 +0100)

Trivial merge