Merge commit 'upstream/3.12.0.beta1' into 312/master
authorStephane Glondu <steph@glondu.net>
Wed, 16 Jun 2010 15:36:05 +0000 (08:36 -0700)
committerStephane Glondu <steph@glondu.net>
Wed, 16 Jun 2010 15:36:05 +0000 (08:36 -0700)

Trivial merge