Merge branch 'master' of git.onelab.eu:/git/build
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 11 Jun 2010 16:19:05 +0000 (18:19 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 11 Jun 2010 16:19:05 +0000 (18:19 +0200)

Trivial merge