Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Fri, 20 Aug 2010 13:09:28 +0000 (15:09 +0200)
committerroot <root@blitz.inria.fr>
Fri, 20 Aug 2010 13:09:28 +0000 (15:09 +0200)
commitbf875be66195318943b34cd86845f9d83c0bdeb4
tree2d7388da0debe19e7649b051cbccbb18a6e3e83b
parent39553505e4ab024b95a905755883b3d997ec4fd7
parentc67aa31fbe47b5397f4ba11f14f8f814c4f6bf83
Merge commit 'local_master/master'