Merge commit 'upstream/3.11.0' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Thu, 4 Dec 2008 16:04:31 +0000 (17:04 +0100)
committerStephane Glondu <steph@glondu.net>
Thu, 4 Dec 2008 16:04:31 +0000 (17:04 +0100)

Trivial merge