Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Mon, 15 Nov 2010 22:50:02 +0000 (23:50 +0100)
committerroot <root@blitz.inria.fr>
Mon, 15 Nov 2010 22:50:02 +0000 (23:50 +0100)
commit9e29bc931570666bfc194df1aa631166f72f29d7
treec90c2de036517b8e5e99d3d1da9e7fbe29da2a73
parent51ba38387b55d21a159e84b20a12bdcf961180b1
parenta225821931d0a387a83e93f68a304da47a182085
Merge commit 'origin/master'