Merge commit 'upstream/3.11.1.rc0'
authorStephane Glondu <steph@glondu.net>
Tue, 19 May 2009 15:41:27 +0000 (17:41 +0200)
committerStephane Glondu <steph@glondu.net>
Tue, 19 May 2009 15:41:27 +0000 (17:41 +0200)

Trivial merge