Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 14 Oct 2011 09:00:40 +0000 (11:00 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 14 Oct 2011 09:00:40 +0000 (11:00 +0200)

Trivial merge