Merge branch 'master' into libinstaller_dos_wip
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 23:56:35 +0000 (16:56 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 19 Jul 2010 23:56:35 +0000 (16:56 -0700)
commit04485f48391455fbd528640eff54ab09c23f8d93
treec3b7ced66c5a0f2e571625da64af0b52a05c4c5d
parent9b18ab6c1019239a19160290775460601c569357
parent9b30e3868cc76c13766bb686024832f274d97c45
Merge branch 'master' into libinstaller_dos_wip

Resolved Conflicts:
libinstaller/syslxopt.c
mtools/syslinux.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
mtools/syslinux.c