Merge commit 'upstream/3.11.2' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:31:35 +0000 (18:31 +0100)
committerStephane Glondu <steph@glondu.net>
Wed, 20 Jan 2010 17:31:35 +0000 (18:31 +0100)
commitf5b283205e0d6e70ac5c1fbda31da75ce6dafa80
tree778804a09193d81affc0f74e1d80a31500277d8f
parent5f460770d8a96e6f57283ae17e7e0fba9e719e85
parentc1b50f796f36d79f7c92eef8b55d89604b07e1e5
Merge commit 'upstream/3.11.2' into experimental/master