Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 29 Mar 2011 05:18:50 +0000 (07:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 29 Mar 2011 05:18:50 +0000 (07:18 +0200)

Trivial merge