Merge commit 'upstream/3.12.1'
authorStephane Glondu <steph@glondu.net>
Tue, 5 Jul 2011 19:28:17 +0000 (21:28 +0200)
committerStephane Glondu <steph@glondu.net>
Tue, 5 Jul 2011 19:28:17 +0000 (21:28 +0200)

Trivial merge