Merge branch 'master' of git.onelab.eu:/git/build
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 2 Jul 2010 15:01:48 +0000 (17:01 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 2 Jul 2010 15:01:48 +0000 (17:01 +0200)

Trivial merge