From: Erwan Velu <erwanaliasr1@gmail.com>
Date: Wed, 16 Mar 2011 20:27:10 +0000 (+0100)
Subject: Merge remote branch 'hpa/master' into libupload
X-Git-Tag: syslinux-4.05-pre1~20^2~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7bd46471d1bda0d40921a13a2dc148f6265b781a;p=platform%2Fupstream%2Fsyslinux.git

Merge remote branch 'hpa/master' into libupload
---

7bd46471d1bda0d40921a13a2dc148f6265b781a