From: H. Peter Anvin <hpa@zytor.com>
Date: Fri, 5 Mar 2010 19:28:06 +0000 (-0800)
Subject: Merge remote branch 'origin/master' into pathbased
X-Git-Tag: syslinux-4.00-pre34~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2fb7b6d629cad831e1ba40d01d9b8e1816cb518;p=platform%2Fupstream%2Fsyslinux.git

Merge remote branch 'origin/master' into pathbased

Resolved Conflicts:
	version
---

c2fb7b6d629cad831e1ba40d01d9b8e1816cb518