From: Erwan Velu <erwanaliasr1@gmail.com>
Date: Sat, 17 Dec 2011 15:23:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'hpa/master'
X-Git-Tag: syslinux-4.06-pre2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f23bbba1764cffbdd32c55126d9dd201e8087cb3;p=profile%2Fivi%2Fsyslinux.git

Merge remote-tracking branch 'hpa/master'
---

f23bbba1764cffbdd32c55126d9dd201e8087cb3