Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Jun 2011 11:39:03 +0000 (13:39 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Jun 2011 11:39:03 +0000 (13:39 +0200)

Trivial merge