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

diff --cc ChangeLog
index 68694c7,2c43f6a..e1a7d8f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,8 +1,18 @@@
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * Makefile.am (default_payload.elf): Add pata to loaded modules.
 +      Load config file from (cbfsdisk)/etc/grub.cfg.
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * util/grub-install-common.c (grub_install_copy_files): Fix module
 +      destination directory.
 +
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * tests/util/grub-shell.in: Don't fail on emu platform if po/*.gmo
+       files have not been built.
+ 
  2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
  
        * grub-core/osdep/unix/hostdisk.c (grub_util_make_temporary_file):