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)
commitae83f521481b087cdff3f73680c3d12ed154dad0
tree0d0533a51ead94b5137ff32eded2026e571d3548
parentbc78019ac79633b6ea6c3268994779c8d32f8b7e
parent544244070afa8871a154a64a86aa00a6dbfacb49
Merge commit 'upstream/3.11.1'

Merge commit '544244070afa8871a154a64a86aa00a6dbfacb49' into HEAD