Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Dec 2010 15:25:13 +0000 (16:25 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 7 Dec 2010 15:25:13 +0000 (16:25 +0100)

Trivial merge