Merge from trunk.

diff --cc conf/any-emu.rmk
index d79ec542b062e31562db92142a2c469960c17ae2,6c6f3657f7228e476db66c141cad9cff11024655..69c01f298dec1e9cbbcadcdc8b9dbce3660a9bbc
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -37,22 -37,8 +37,22 @@@ grub_emu_SOURCES = commands/minicmd.c c
        fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
        fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c                  \
        fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c                \
-       fs/befs.c fs/befs_be.c fs/tar.c                         \
+       fs/befs.c fs/befs_be.c fs/tar.c                                 \
        \
 +      video/video.c video/fb/video_fb.c video/fb/fbblit.c             \
 +        video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c        \
 +      video/bitmap.c video/bitmap_scale.c video/readers/tga.c         \
 +      video/readers/jpeg.c video/readers/png.c font/font_cmd.c        \
 +      font/font.c term/gfxterm.c io/bufio.c                           \
 +      \
 +      gfxmenu/gfxmenu.c gfxmenu/model.c gfxmenu/view.c                \
 +      gfxmenu/icon_manager.c gfxmenu/theme_loader.c                   \
 +      gfxmenu/widget-box.c gfxmenu/gui_canvas.c                       \
 +      gfxmenu/gui_circular_progress.c gfxmenu/gui_box.c               \
 +      gfxmenu/gui_label.c gfxmenu/gui_list.c gfxmenu/gui_image.c      \
 +      gfxmenu/gui_progress_bar.c gfxmenu/gui_util.c                   \
 +      gfxmenu/gui_string_util.c gfxmenu/named_colors.c trigtables.c   \
 +      \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
        \

diff --cc conf/common.rmk
Simple merge

diff --cc configure.ac
Simple merge