From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 11 Apr 2012 13:12:35 +0000 (+0200)
Subject: Merge branch 'master' into lxc_devel
X-Git-Tag: bootmanager-5.1-1~3
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=0a520a0ca91980d6d7d235a18366b0f486c8f2f5

Merge branch 'master' into lxc_devel
---

0a520a0ca91980d6d7d235a18366b0f486c8f2f5