Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Dec 2010 16:08:44 +0000 (17:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 6 Dec 2010 16:08:44 +0000 (17:08 +0100)

Trivial merge