Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Apr 2011 12:18:39 +0000 (14:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 6 Apr 2011 12:18:39 +0000 (14:18 +0200)

Trivial merge