Merge commit 'upstream/3.12.1_rc1'
authorStephane Glondu <steph@glondu.net>
Wed, 15 Jun 2011 16:18:34 +0000 (18:18 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 15 Jun 2011 16:18:34 +0000 (18:18 +0200)

Trivial merge