Merge commit 'upstream/3.11.1.rc1'
authorStephane Glondu <steph@glondu.net>
Wed, 3 Jun 2009 11:13:11 +0000 (13:13 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 3 Jun 2009 11:13:11 +0000 (13:13 +0200)
commit47c1c2e951a7df5e8a61a2ac8e3fb566b8b2ad5d
treef4f818398115d8e2be81ae709fd417dc67ad71e3
parent6e2dabf7727899fe1f0fd9ae23ffd49d975ac2f3
parentb9389f46240297ef827cd2bd5585103679a1d100
Merge commit 'upstream/3.11.1.rc1'