Merge branch 'master' of git.onelab.eu:/git/sface sface-0.1-1
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 27 Sep 2010 14:13:34 +0000 (16:13 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Mon, 27 Sep 2010 14:13:34 +0000 (16:13 +0200)

Trivial merge