Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 May 2011 09:09:10 +0000 (11:09 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 16 May 2011 09:09:10 +0000 (11:09 +0200)

Trivial merge