Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 22 Jul 2010 09:56:49 +0000 (11:56 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 22 Jul 2010 09:56:49 +0000 (11:56 +0200)

Trivial merge