Merge commit 'upstream/3.12.0' into 312/master
authorStephane Glondu <steph@glondu.net>
Wed, 4 Aug 2010 01:52:29 +0000 (21:52 -0400)
committerStephane Glondu <steph@glondu.net>
Wed, 4 Aug 2010 01:52:29 +0000 (21:52 -0400)

Trivial merge