Merge commit 'upstream/3.12.1_rc1'
authorStephane Glondu <steph@glondu.net>
Wed, 15 Jun 2011 16:18:34 +0000 (18:18 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 15 Jun 2011 16:18:34 +0000 (18:18 +0200)
commit9cba0758bfb67e450b8e606b8c530ed989e68ac3
treee0a7fa1cd4c7ce298e523eb1bfc957adc92be5ba
parent330dcbc6da27afff63ab25c9070d70bd8dd59266
parent05cf7b74a9913efad4360ad9b838096634e01e12
Merge commit 'upstream/3.12.1_rc1'