Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 1 Jul 2010 14:53:46 +0000 (16:53 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 1 Jul 2010 14:53:46 +0000 (16:53 +0200)

Trivial merge