Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 18:32:09 +0000 (19:32 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 18:32:09 +0000 (19:32 +0100)
commit06b05dc703a7c908b06d1362d31fe1c9c7966373
tree0f07fa7968d3fad513f9226852d3493770fd184c
parent1b34ec8efbedde6e2dacea37c04d1db71cca4ddd
parent1c92c333ad668b173ba5abba552464ffaf990fe7
Merge commit 'origin/master'