Merge branch 'master' of ssh://git.onelab.eu/git/bootcd
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Mar 2011 10:03:39 +0000 (11:03 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Mar 2011 10:03:39 +0000 (11:03 +0100)

Trivial merge