merge ia64-emu into ia64

diff --cc Makefile.util.def
Simple merge

diff --cc configure.ac
Simple merge

diff --cc gentpl.py
Simple merge

diff --cc grub-core/Makefile.am
Simple merge

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/kern/dl.c
Simple merge

diff --cc grub-core/kern/ia64.moved/trampoline.S
index e91991041fdeb2ac930356e75522eb65014c3eab,0000000000000000000000000000000000000000..e91991041fdeb2ac930356e75522eb65014c3eab
mode 100644,000000..100644
--- 1/grub-core/kern/ia64/trampoline.S
--- /dev/null
+++ b/grub-core/kern/ia64.moved/trampoline.S

diff --cc include/grub/dl.h
Simple merge

diff --cc include/grub/types.h
Simple merge