Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 4 May 2009 09:15:37 +0000 (11:15 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 4 May 2009 09:15:37 +0000 (11:15 +0200)
commit6414d36028e256ad087bac9c8efd2fc1883e12c8
tree3c0936bdee312f9f94a03e4cc3fb7f4b31a0986c
parent25b4d42f3259add3c931e6536bae3813c7fe3dfc
parenta7a7a73ba060832779899028bcc504650df86e66
Merge commit 'origin/upstream-svn' into upstream