Merge commit 'upstream/3.11.2.rc1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Mon, 28 Dec 2009 15:11:23 +0000 (16:11 +0100)
committerStephane Glondu <steph@glondu.net>
Mon, 28 Dec 2009 17:50:06 +0000 (18:50 +0100)

Trivial merge