Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Sep 2010 10:39:00 +0000 (12:39 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Sep 2010 10:39:00 +0000 (12:39 +0200)

Trivial merge