Merge commit 'origin/master' into nolen syslinux-3.70-pre4
authorH. Peter Anvin <hpa@zytor.com>
Tue, 4 Mar 2008 04:20:09 +0000 (20:20 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 4 Mar 2008 04:20:09 +0000 (20:20 -0800)
commit0469c2d284a4c5265c0856cb4b67ec97b5b3f240
tree5e509ea4f3cadc83c8795bccab91f9f5169e4502
parent302eba2d7e3e4bd3a01d5bb102a6180e159062b3
parentc0dceadac707eb030e5ea0f1c3139c9474b0888e
Merge commit 'origin/master' into nolen

Conflicts:

version