merge mainline into install

diff --cc ChangeLog
index edbc9b60d5144d92bf61d4ea8f4bf991b79bf8fa,0bb728b6b6e7881cf409fcdf75fd4c3e053e73fa..2acf132ee835faa9a701dea1159493f551ab408c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -230,18 -693,27 +693,36 @@@
        (grub_reboot): Likewise.
        * grub-core/kern/i386/coreboot/init.c (grub_stop_floppy): Moved from here...
        * include/grub/i386/floppy.h (grub_stop_floppy): ...here. Inlined.
+       * grub-core/kern/i386/pc/startup.S (grub_hard_stop): Removed.
+ 
+ 2010-08-30  Robert Millan  <rmh@gnu.org>
+ 
+       * NEWS: Document addition of ZFS support in `grub-install' and
+       `grub-mkconfig'.
+ 
+ 2010-08-30  BVK Chaitanya  <bvk.groups@gmail.com>
+ 
+       * conf/Makefile.common (CPPFLAGS_DEFAULT): Remove leading / from
+       dprintf output.
  
-       * grub-core/kern/i386/pc/startup.S (grub_hard_stop)
+ 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+ 
+       Remove leftover embedding of font objects.
+ 
+       * include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
+       * util/grub-install.in (font): Removed.
+       * util/grub-mkimage.c (generate_image): Remove font support. All users
+       updated.
  
 +2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Remove leftover embedding of font objects.
 +
 +      * include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
 +      * util/grub-install.in (font): Removed.
 +      * util/grub-mkimage.c (generate_image): Remove font support. All users
 +      updated.
 +
  2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * docs/grub.texi (Network): Fix reference to pxe_blksize.

diff --cc Makefile.util.def
Simple merge