Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Feb 2009 10:35:36 +0000 (11:35 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 23 Feb 2009 10:35:36 +0000 (11:35 +0100)
commit394f843100ccde77fd274d5de81237660dbbf644
tree4597d265639739e4708dc24371ca0670e8fcb76f
parent81be8e6c39d71a86566fee0a00fe252a88eceb89
parent5f2edc00b7ed5b3d36e62ec81509937ac6760a82
Merge commit 'origin/upstream-svn' into upstream