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

diff --cc ChangeLog
index 87c4cace5626f17e3958cd468a487976416dd049,c356df2827ea12c9e78fd81362d722f131b3c33d..aa39cb968913a6efc5441b4101b8eb752e3d35d5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2013-11-18  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * util/grub-mkrescue.c (main): Fix typo.
+ 
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/kern/mips/qemu_mips/init.c (grub_machine_init): Update
 +      clock frequency to 200 MHz,
 +
 +2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * tests/util/grub-shell.in: Increase console size to 1024x1024.
 +
  2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * Makefile.am (default_payload.elf): Add pata to loaded modules.