Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 4 Oct 2011 11:11:50 +0000 (13:11 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 4 Oct 2011 11:11:50 +0000 (13:11 +0200)

Trivial merge