Merge branch 'master' of git.onelab.eu:/git/build
authorMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 30 Mar 2012 14:19:08 +0000 (16:19 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 30 Mar 2012 14:19:08 +0000 (16:19 +0200)

Trivial merge