Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 7 Jul 2010 15:13:26 +0000 (17:13 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Wed, 7 Jul 2010 15:13:26 +0000 (17:13 +0200)

Trivial merge