Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Sat, 14 Mar 2009 08:09:24 +0000 (09:09 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Sat, 14 Mar 2009 08:09:24 +0000 (09:09 +0100)
commit859540e7487de5ddde7abf8ea64e23ba02c59039
tree4706b2ad42adf8351bbea18f065a663ea3c9a0ed
parent72efb690360ed2fd199e24a614c3d4ac8644f33c
parent5d410079b6445f851ab7c0d135a4574b0f5880a2
Merge commit 'origin/upstream-svn' into upstream