Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Sun, 31 Oct 2010 23:08:01 +0000 (00:08 +0100)
committerroot <root@blitz.inria.fr>
Sun, 31 Oct 2010 23:08:01 +0000 (00:08 +0100)
commit5fe5e5016647c4e579d2d936a8609956779c7e59
treef4d153319ec77c233fc4ffadfb2b5863f056e9e3
parent9474008385c225d65e05e29f0a67067d655db301
parentcd6a21932d78712c3d731559ee015248c651e245
Merge commit 'origin/master'