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

Trivial merge