Merge branch 'master' of git.onelab.eu:/git/build
authorMohamed Larabi <mohamed.larabi@inria.fr>
Thu, 7 Feb 2013 15:39:43 +0000 (16:39 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Thu, 7 Feb 2013 15:39:43 +0000 (16:39 +0100)

Trivial merge