Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 21:18:14 +0000 (23:18 +0200)
committerroot <root@blitz.inria.fr>
Fri, 1 Apr 2011 21:18:14 +0000 (23:18 +0200)
commit41c04b2453c315b8046283e7a0e18b712812c732
treeaefdc9d0775940024ed63b2c4cdb5a000c85ae3a
parent1bc9e626e0167823351f3255a57f5be79367dc06
parente9f99808ead0c9c48b776811d27a18b3a0170144
Merge commit 'origin/master'