From: H. Peter Anvin <hpa@zytor.com>
Date: Sat, 6 Feb 2010 01:28:27 +0000 (-0800)
Subject: Merge branch 'master' into fsc
X-Git-Tag: syslinux-4.00-pre17^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dafb8402ed666b37f96f6e1579a99b8a8c85452;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'master' into fsc

Resolved Conflicts:
	core/pxelinux.asm

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

2dafb8402ed666b37f96f6e1579a99b8a8c85452