Merge branch 'master' of git.sv.gnu.org:/srv/git/grub

diff --cc ChangeLog
index faf8d81d56b9c1537d3d7139b71f2a2c3d2f28cc,92262ceb1a33814a7a6bc8419509d5fe09d85c16..88406393e40d18ba2a57f937366d75d097ef4bc2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,19 +1,23 @@@
+ 2013-12-16  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+       * grub-core/osdep/linux/platform.c (grub_install_get_default_x86_platform):
+       Add verbose information which firmware directories were tried.
+ 
+ 2013-12-16  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+       * grub-core/osdep/unix/exec.c (grub_util_exec_redirect_all): New
+       function to optionally redirect all three standard descriptors.
+       Redefine grub_util_exec, grub_util_exec_redirect and
+       grub_util_exec_redirect_null to use it.
+       * include/grub/emu/exec.h: Define it.
+       * include/grub/osdep/exec_unix.h: Delete, it is unused.
+       * grub-core/osdep/linux/platform.c (grub_install_get_default_x86_platform):
+       Use grub_util_exec_redirect_all to redirect error to NULL.
+ 
 +2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/tests/sleep_test.c: Silence spurious warning.
 +
  2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Make grub_xen_hypercall on i386 cdecl rather than stdcall to avoid