Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:31:54 +0000 (22:31 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Wed, 9 Sep 2009 20:31:54 +0000 (22:31 +0200)
commit666cb6f49a50340edd4be7c49716c479e482954d
tree9be1663ca08900777f6fa8ee1c04e9d7576b1022
parenta52cd8de2603e805f3013016d8b4762da36c5719
parentb49a31de99ad89a78b9c20b3c0c3ddfb3e232417
Merge branch 'upstream'