Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 14 Jun 2012 21:14:54 +0000 (00:14 +0300)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 14 Jun 2012 21:14:54 +0000 (00:14 +0300)

Trivial merge