Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 26 Oct 2010 20:50:05 +0000 (22:50 +0200)
committerroot <root@blitz.inria.fr>
Tue, 26 Oct 2010 20:50:05 +0000 (22:50 +0200)
commit9474008385c225d65e05e29f0a67067d655db301
tree6142cc19c56d324af29fef1c8e3a42219bab52ed
parentc0755c14a9cb06506aa0a91fa8be3fbc14ca029b
parentbabf33826061552602be64919c1f6ef04235152e
Merge commit 'origin/master'