Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:21:14 +0000 (18:21 +0100)
committerroot <root@blitz.inria.fr>
Thu, 9 Dec 2010 17:21:14 +0000 (18:21 +0100)
commit61eddcee6bc0e5e7c623d23688bd538e2a452b12
tree5035f748c72f52e67e987220525feb522ba5b1fa
parent4d1c64590ff7e37354c858d09ea5f294db380f3c
parent9002aabb7b73b4bf3489b6c99dda3f1bef1f2cf5
Merge commit 'origin/master'