merge trunk

diff --cc docs/grub.texi
index 885bb473119f4ac9b2bfa39f6f8d7a3e5951bde5,818417d41bad1373d7cf313a90ef0c3380dd8037..26c51ed8b134e50308c08809e6f63e89dec0fda0
--- 1/docs/grub.texi
--- 2/docs/grub.texi
+++ b/docs/grub.texi
@@@ -1140,8 -1203,7 +1203,8 @@@ listed in @file{/boot/grub/video.lst}
  Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
  you can only use modes which your graphics card supports via VESA BIOS
  Extensions (VBE), so for example native LCD panel resolutions may not be
 -available.  The default is @samp{640x480}.  @xref{gfxmode}.
 +available.  The default is @samp{auto}, which tries to select a preferred
- resolution.
++resolution.  @xref{gfxmode}.
  
  @item GRUB_BACKGROUND
  Set a background image for use with the @samp{gfxterm} graphical terminal.

diff --cc grub-core/commands/videoinfo.c
Simple merge

diff --cc grub-core/video/i386/pc/vbe.c
Simple merge

diff --cc grub-core/video/video.c
Simple merge

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

diff --cc util/grub.d/00_header.in
Simple merge