Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Feb 2011 11:44:51 +0000 (12:44 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 18 Feb 2011 11:44:51 +0000 (12:44 +0100)

Trivial merge