Merge mainline into fuse

.bzrignore

@@ -26,12 +26,16 @@ docs/*.info
 docs/stamp-vti
 docs/version.texi
 *.elf
+example_grub_script_test
+example_scripted_test
+example_unit_test
 *.exec
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
 grub-bin2h
-grub-dumpbios
+grub_cmd_echo
+grub_cmd_regexp
 grub-editenv
 grub-emu
 grub_emu_init.c
@@ -45,15 +49,33 @@ grub-macho2img
 grub-menulst2cfg
 grub-mk*
 grub-mount
-grub-pbkdf2
 grub-pe2elf
 grub-probe
 grub_probe_init.c
 grub_probe_init.h
 grub-reboot
+grub_script_blanklines
+grub_script_blockarg
+grub_script_break
 grub-script-check
 grub_script_check_init.c
 grub_script_check_init.h
+grub_script_comments
+grub_script_continue
+grub_script_dollar
+grub_script_echo1
+grub_script_echo_keywords
+grub_script_expansion
+grub_script_final_semicolon
+grub_script_for1
+grub_script_functions
+grub_script_if
+grub_script_not
+grub_script_return
+grub_script_setparams
+grub_script_shift
+grub_script_vars1
+grub_script_while1
 grub_script.tab.c
 grub_script.tab.h
 grub_script.yy.c
@@ -77,6 +99,7 @@ Makefile
 *.mod
 mod-*.c
 missing
+partmap_test
 *.pf2
 *.pp
 po/*.mo
@@ -111,6 +134,7 @@ grub-core/Makefile.gcry.def
 grub-core/contrib
 grub-core/genmod.sh
 grub-core/gensyminfo.sh
+grub-core/modinfo.sh
 grub-core/*.module
 grub-core/*.pp
 util/bash-completion.d/grub
@@ -135,3 +159,6 @@ grub-core/gnulib/wctype.h
 grub-core/rs_decoder.S
 widthspec.bin
 widthspec.h
+docs/stamp-1
+docs/version-dev.texi
+Makefile.utilgcry.def