Merge branch 'master' of ssh://git.onelab.eu/git/omf
Thierry Parmentelat [Thu, 1 Jul 2010 12:22:28 +0000 (14:22 +0200)]

Trivial merge