Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:29:27 +0000 (22:29 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:29:27 +0000 (22:29 +0200)
commita52cd8de2603e805f3013016d8b4762da36c5719
tree9646e4b5d50a8228e8a4c0ac88b6ebc23be29ced
parent26c84dd6adc740abdfde81ab5f7e6b69f32eac8b
parent406c064d91a59d8985aea7e6750c4e035ab35669
Merge branch 'upstream'