From: H. Peter Anvin <hpa@zytor.com>
Date: Sun, 14 Jun 2009 23:21:33 +0000 (-0700)
Subject: Merge branch 'master' into core32
X-Git-Tag: syslinux-4.00-pre1~2^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aba4633355325e8415daf0081da0ae94ec51c90c;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'master' into core32

Resolved Conflicts:
	version

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

aba4633355325e8415daf0081da0ae94ec51c90c