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

diff --cc ChangeLog
index d330978,3992fb9..aa4c05c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
+ 2013-12-09  Jon McCune <jonmccune@google.com>
+ 
+       * Add --no-rs-codes flag to optionally disable reed-solomon codes
+       in grub-install and grub-bios-setup for x86 BIOS targets.
+ 
 +2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Add missing compile and link options for sparc64-emu.
 +
  2013-12-09  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Implement sparc64 trampolines (needed for sparc64-emu).