From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 17 Jan 2011 21:28:02 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
X-Git-Tag: bootmanager-5.0-16~5
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=2a0371d3e0b21c4db1c6eb7915be2d184ca76a05

Merge branch 'master' of ssh://git.onelab.eu/git/bootmanager
---

2a0371d3e0b21c4db1c6eb7915be2d184ca76a05