Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Sep 2010 19:51:59 +0000 (21:51 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Sep 2010 19:51:59 +0000 (21:51 +0200)

Trivial merge