Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 23:52:33 +0000 (01:52 +0200)
committerroot <root@blitz.inria.fr>
Tue, 5 Apr 2011 23:52:33 +0000 (01:52 +0200)
commita59241a590ca035a320f06fa7cca0d309af53f5a
treeebd2d1b7d4992c435f9ed59cc8744d73b1354e23
parentcdc2396b04e5de401e75a57b27ed963a2f2663a4
parentbf8e9a674484cb0aecca7f7319068e562c705877
Merge commit 'origin/master'