Merge commit 'upstream/3.12.0' into 312/master
authorStephane Glondu <steph@glondu.net>
Wed, 4 Aug 2010 01:52:29 +0000 (21:52 -0400)
committerStephane Glondu <steph@glondu.net>
Wed, 4 Aug 2010 01:52:29 +0000 (21:52 -0400)
commitf4bd82ad6a98f3bb3f2228eafc9a71840d978736
treeb45fde3762e837fc4a9babf6cb2c4a474b1f81a3
parent59acb4158d6e18be33f73c02f7d25ce730bdd99d
parent55080e38cbd768e9866e105933dc2cbe8a8bba30
Merge commit 'upstream/3.12.0' into 312/master