Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorBaris Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 18 Jun 2010 13:19:57 +0000 (15:19 +0200)
committerBaris Metin <Talip-Baris.Metin@sophia.inria.fr>
Fri, 18 Jun 2010 13:19:57 +0000 (15:19 +0200)

Trivial merge