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

diff --cc ChangeLog
index 959db45df41999a70f425231950d9c365790864a,409fc70efda1da55a8c852baa5cd803775c26456..fec4dc731f3f4259e1aaae224dc091e756e54f29
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,40 -1,9 +1,46 @@@
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):
+       Handle errors from mkstemp.
+       (grub_util_make_temporary_dir): Handle errors from mkdtemp.
+ 
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * tests/util/grub-shell.in: Use -cdrom and don't force cdrom
 +      on primary master on pseries.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/tests/videotest_checksum.c: Don't reload unifont if it's
 +      already loaded. This saves memory needed for tests,
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/grub-mkrescue.c (main): Fix a typo to make yeeloong part
 +      work again.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/term/terminfo.c (grub_cmd_terminfo): Fix a typo to make -g
 +      work again.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * tests/util/grub-shell.in: For powerpc tests put the CD-ROM as primary
 +      master since with some combinations of qemu and firmware only primary
 +      IDE channel is available.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on
 +      low-memory platforms where we don't have enough memory for them.
 +      * grub-core/tests/videotest_checksum.c: Likewise.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/tests/cmdline_cat_test.c: Don't reload unifont if it's
 +      already loaded. This saves memory needed for tests,
 +
  2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Fix handling of install lists.