Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 6 Oct 2011 17:52:46 +0000 (19:52 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 6 Oct 2011 17:52:46 +0000 (19:52 +0200)

Trivial merge