Merge remote branch 'origin/master'
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 28 Sep 2010 08:35:36 +0000 (10:35 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 28 Sep 2010 08:35:36 +0000 (10:35 +0200)

Trivial merge