Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 5 Dec 2010 15:33:39 +0000 (16:33 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Sun, 5 Dec 2010 15:33:39 +0000 (16:33 +0100)

Trivial merge