Merge branch 'master' of git.onelab.eu:/git/build
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 8 Jul 2010 13:56:34 +0000 (15:56 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 8 Jul 2010 13:56:34 +0000 (15:56 +0200)

Trivial merge