Merge branch 'master' of git.onelab.eu:/git/build
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 3 Jan 2011 14:29:53 +0000 (15:29 +0100)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 3 Jan 2011 14:29:53 +0000 (15:29 +0100)

Trivial merge