Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Jan 2011 16:31:28 +0000 (17:31 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 3 Jan 2011 16:31:28 +0000 (17:31 +0100)

Trivial merge