Merge commit 'upstream/3.11.1.rc1'
authorStephane Glondu <steph@glondu.net>
Wed, 3 Jun 2009 11:13:11 +0000 (13:13 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 3 Jun 2009 11:13:11 +0000 (13:13 +0200)

Trivial merge