From: root <root@blitz.inria.fr>
Date: Fri, 16 Jul 2010 04:32:09 +0000 (+0200)
Subject: Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=becb02bfb33dd14e133b8216159e03e09557eb65

Merge commit 'local_master/bootmanager-vender' into myplc-0_4-branch
---

becb02bfb33dd14e133b8216159e03e09557eb65