Merge branch 'master' of git.onelab.eu:/git/sfa
authorMohamed Larabi <mohamed.larabi@inria.fr>
Wed, 26 Sep 2012 13:43:47 +0000 (15:43 +0200)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Wed, 26 Sep 2012 13:43:47 +0000 (15:43 +0200)

Trivial merge