Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Sep 2010 08:21:33 +0000 (10:21 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Sep 2010 08:21:33 +0000 (10:21 +0200)

Trivial merge