Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:24:16 +0000 (18:24 +0100)
committerroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:24:16 +0000 (18:24 +0100)
commite8ef894f0a0eb769eb27abe0d7a77484cc6d6d2f
tree9737769dae905bfdd4355e9ff2e0c373446ac98c
parent61eddcee6bc0e5e7c623d23688bd538e2a452b12
parentca0af38b1105e13d1441102cfb61b3cec62c298e
Merge commit 'origin/master'