From: H. Peter Anvin <hpa@zytor.com>
Date: Fri, 30 Jul 2010 17:24:04 +0000 (-0700)
Subject: Merge branch 'master' into disklib
X-Git-Tag: syslinux-4.06-pre3~3^2~90
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00fff30973174315088b358402a9ef73dab31cf8;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'master' into disklib

Resolved Conflicts:
	com32/modules/chain.c

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

00fff30973174315088b358402a9ef73dab31cf8