Merge branch 'master' of git.onelab.eu:/git/build
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 13 Oct 2010 16:03:57 +0000 (18:03 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 13 Oct 2010 16:03:57 +0000 (18:03 +0200)

Trivial merge