Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 21:44:00 +0000 (22:44 +0100)
committerroot <root@blitz.inria.fr>
Tue, 16 Nov 2010 21:44:00 +0000 (22:44 +0100)
commit57de50e9ae2f421500184955b10c9da5a7b53bab
tree14812be7657f7760610fc04141bdfac378db44cc
parent0803b46c4d204e5f0783026a201c09d4103118ef
parent2241d4ad029eb27176ef792efa2b9faca6653843
Merge commit 'origin/master'