Merge commit 'local_master/master'
authorroot <root@blitz.inria.fr>
Tue, 8 Mar 2011 22:33:15 +0000 (23:33 +0100)
committerroot <root@blitz.inria.fr>
Tue, 8 Mar 2011 22:33:15 +0000 (23:33 +0100)
commit9a52ad4578afe2fe7d1bcd190a7584241aa71206
tree718c0f07cfbbfcfcefd47a23083bd85a403ce5da
parentaaa3d0a3c38f79b8f8062d5e1cdf48a115ad714d
parentc7997772a39906d51d8c6f20825e3871c74d20ba
Merge commit 'local_master/master'