Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 19 Nov 2011 20:43:10 +0000 (21:43 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sat, 19 Nov 2011 20:43:10 +0000 (21:43 +0100)

Trivial merge