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

Trivial merge