Merge branch 'upstream'
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 14 Sep 2009 22:18:58 +0000 (00:18 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 14 Sep 2009 22:18:58 +0000 (00:18 +0200)
commite00c1920ce4599c386d8832e49efd8ac39ed50ce
tree55e6f7c5eb26ce93d47fa36e4fe100939eafccd5
parent12e92abc85749c77e6be9a00ba69169055c0a1d7
parent126bf391b0f9cef220c275d50adae6770e7daafa
Merge branch 'upstream'