Merge commit 'origin/trunk@12184' into fedora fedora
authorroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:36 +0000 (06:13 +0100)
committerroot <root@blitz.inria.fr>
Mon, 22 Nov 2010 05:13:36 +0000 (06:13 +0100)
commit65d1e3fdac47d3d758f6f018457c28d6f3f6306a
treedb65675037d16134af0cee24897b68780acb6bba
parent98c90cbcc6f660e13f9e7878bbb80dfc9d03ceae
parent6430f84b3c584cdd15c9df7599618296bc7a232d
Merge commit 'origin/trunk@12184' into fedora