Merge mainline into fuse

diff --cc .bzrignore
index d4d5987,6e0253c..9135d7f
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -44,8 -48,6 +48,7 @@@ grub-kbdcom
  grub-macho2img
  grub-menulst2cfg
  grub-mk*
- grub-pbkdf2
 +grub-mount
  grub-pe2elf
  grub-probe
  grub_probe_init.c

diff --cc Makefile.util.def
index 313339a,8742d15..79484c4
--- 1/Makefile.util.def
--- 2/Makefile.util.def
+++ b/Makefile.util.def
@@@ -207,26 -231,12 +231,27 @@@ program = 
    cppflags = '$(CPPFLAGS_GCRY)';
  
    ldadd = libgrubmods.a;
+   ldadd = libgrubgcry.a;
    ldadd = libgrubkern.a;
    ldadd = grub-core/gnulib/libgnu.a;
-   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)';
  };
  
 +program = {
 +  name = grub-mount;
 +  mansection = 1;
 +  common_nodist = grub_fstest_init.c;
 +  common = util/grub-mount.c;
 +  common = grub-core/kern/emu/hostfs.c;
 +  common = grub-core/disk/host.c;
 +
 +  ldadd = libgrubmods.a;
 +  ldadd = libgrubkern.a;
 +  ldadd = grub-core/gnulib/libgnu.a;
 +  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
 +  condition = COND_GRUB_MOUNT;
 +};
 +
  program = {
    name = grub-mkfont;
    mansection = 1;

diff --cc configure.ac
Simple merge