Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 17 Jan 2011 21:28:02 +0000 (22:28 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 17 Jan 2011 21:28:02 +0000 (22:28 +0100)

Trivial merge