Merge commit 'upstream/3.11.0.beta1' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Fri, 17 Oct 2008 10:22:51 +0000 (12:22 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 17 Oct 2008 10:22:51 +0000 (12:22 +0200)

Trivial merge