Merge branch 'grub-0.97-solaris-portable' into 'grub4dos-solaris'
Conflicts:
ChangeLog
configure
configure.ac
netboot/cs89x0.c
netboot/cs89x0.txt
netboot/main.c
stage2/Makefile.am
stage2/Makefile.in
stage2/asm.S
stage2/bios.c
stage2/boot.c
stage2/builtins.c
stage2/char_io.c
stage2/cmdline.c
stage2/common.c
stage2/disk_io.c
stage2/filesys.h
stage2/fsys_ext2fs.c
stage2/fsys_fat.c
stage2/fsys_iso9660.c
stage2/fsys_reiserfs.c
stage2/fsys_vstafs.c
stage2/fsys_xfs.c
stage2/graphics.c
stage2/graphics.h
stage2/gunzip.c
stage2/iso9660.h
stage2/shared.h
stage2/stage1_5.c
stage2/stage2.c
stage2/start_eltorito.S
stage2/term.h
util/Makefile.in