Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Tue, 17 Mar 2009 18:54:20 +0000 (19:54 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Tue, 17 Mar 2009 18:54:20 +0000 (19:54 +0100)
commitea57c214658de2a68d721beb3e5b9f232af096e9
treea31f40f267209231de97d3b39d5d9916d6bdc499
parent8ecfccfa4bdc6f8342ec33f86d498290c265fa3f
parent1a0579c90119cbdf545c711ae7ab1adc5d4ce5d4
Merge commit 'origin/upstream-svn' into upstream