Merge branch 'master' of git.onelab.eu:/git/infrastructure
authorBaris Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 17 Jun 2010 16:48:36 +0000 (18:48 +0200)
committerBaris Metin <Talip-Baris.Metin@sophia.inria.fr>
Thu, 17 Jun 2010 16:48:36 +0000 (18:48 +0200)

Trivial merge