merge from trunk

diff --cc conf/common.rmk
Simple merge

diff --cc normal/menu_text.c
Simple merge

diff --cc util/grub-install.in
Simple merge

diff --cc util/grub-mkconfig_lib.in
Simple merge

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

diff --cc util/grub.d/10_kfreebsd.in
index 026f1d7ac2907918aa5649c5649da5f28296b4ac,1329bba1ff0d0e84b52230965a92986d37ba241a..b48d80d58ea17893058e6dd3581e3c44176e2094
--- 1/util/grub.d/10_kfreebsd.in
--- 2/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@@ -38,8 -38,7 +38,8 @@@ kfreebsd_entry (
    recovery="$3"       # not used yet
    args="$4"   # not used yet
    title="$(gettext "%s, with kFreeBSD %s")"
-   printf "menuentry \"${title}\" {" ${os} ${version}
+   printf "menuentry \"${title}\" {\n" "${os}" "${version}"
 +  save_default_entry | sed -e "s/^/\t/"
    if [ -z "${prepare_boot_cache}" ]; then
      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
    fi

diff --cc util/grub.d/10_linux.in
index dc9696ec84f9a2c0a4f2501b3f540df8eec9b118,5fea5338e8deb6d8d79df4fbe962a41383b965ef..3f9c08c9da5b249f19e16016474eba3a7b4f7a40
--- 1/util/grub.d/10_linux.in
--- 2/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@@ -58,8 -58,7 +58,8 @@@ linux_entry (
    else
      title="$(gettext "%s, with Linux %s")"
    fi
-   printf "menuentry \"${title}\" {" ${os} ${version}
+   printf "menuentry \"${title}\" {\n" "${os}" "${version}"
 +  save_default_entry | sed -e "s/^/\t/"
    if [ -z "${prepare_boot_cache}" ]; then
      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
    fi

diff --cc util/grub.d/30_os-prober.in
Simple merge