Merge branch 'master' of git://git.onelab.eu/sfa into upmc
Jordan Augé [Fri, 11 Jan 2013 10:38:51 +0000 (11:38 +0100)]

Trivial merge