Merge commit 'upstream/3.11.1'
authorStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2009 13:54:14 +0000 (15:54 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2009 13:54:14 +0000 (15:54 +0200)
Merge commit '544244070afa8871a154a64a86aa00a6dbfacb49' into HEAD


Trivial merge