From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 31 Aug 2012 10:00:11 +0000 (+0200)
Subject: Merge branch 'master' into lxc_devel
X-Git-Tag: bootmanager-5.1-3~1
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=b8a1ca92870ffab4248d62b4f043791f235c0dd0

Merge branch 'master' into lxc_devel
---

b8a1ca92870ffab4248d62b4f043791f235c0dd0