Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:55:55 +0000 (21:55 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 20:55:55 +0000 (21:55 +0100)
commitd065e00d4caba638d145d11b37fa466e51cbc21b
tree08588ec1d514bdd3dec56e781b953ad26f9a1c8b
parent06b05dc703a7c908b06d1362d31fe1c9c7966373
parent15b5e6e9e78985d0586becf36d5bf45d5707f963
Merge commit 'origin/master'