Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Jun 2011 12:00:53 +0000 (14:00 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Jun 2011 12:00:53 +0000 (14:00 +0200)

Trivial merge