Merge commit 'upstream/3.12.0.rc1' into 312/master
authorStephane Glondu <steph@glondu.net>
Sat, 24 Jul 2010 12:19:59 +0000 (14:19 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 24 Jul 2010 12:19:59 +0000 (14:19 +0200)

Trivial merge