From: H. Peter Anvin <hpa@zytor.com>
Date: Thu, 28 Jan 2010 00:16:14 +0000 (-0800)
Subject: Merge branch 'master' into fsc
X-Git-Tag: syslinux-4.00-pre12^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad8aa52f919cbcadeaf9b60609e5a93ea22b0bf1;p=platform%2Fupstream%2Fsyslinux.git

Merge branch 'master' into fsc

Resolved Conflicts:
	core/ldlinux.asm

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

ad8aa52f919cbcadeaf9b60609e5a93ea22b0bf1