Merge commit 'upstream/3.11.0.rc1' into 3.11/master
authorStephane Glondu <steph@glondu.net>
Sat, 29 Nov 2008 10:16:39 +0000 (11:16 +0100)
committerStephane Glondu <steph@glondu.net>
Sat, 29 Nov 2008 10:16:39 +0000 (11:16 +0100)

Trivial merge