Merge branch 'master' of ssh://git.onelab.eu/git/bootcd
Thierry Parmentelat [Wed, 16 Mar 2011 10:03:39 +0000 (11:03 +0100)]

Trivial merge