Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Sep 2010 11:09:15 +0000 (13:09 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Sep 2010 11:09:15 +0000 (13:09 +0200)

Trivial merge