Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 28 Jun 2010 12:39:09 +0000 (14:39 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 28 Jun 2010 12:39:09 +0000 (14:39 +0200)

Trivial merge