From: Erwan Velu <erwanaliasr1@gmail.com>
Date: Wed, 13 Jun 2012 19:25:55 +0000 (+0200)
Subject: Merge remote-tracking branch 'hpa/master'
X-Git-Tag: syslinux-4.06-pre12~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ad16de11428a5b9e1aff99da050c3414de4e5dc;p=platform%2Fupstream%2Fsyslinux.git

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

5ad16de11428a5b9e1aff99da050c3414de4e5dc