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

diff --cc ChangeLog
index 6fd1989b990aba1504d9c1aef30d632301aa2ccc,f205501833651fd98bff3db56e69bf823059ea81..3aa8197da13b595c896f60a1e62dd19aabc6d72e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,7 +1,16 @@@
+ 2013-10-25  Jon McCune <jonmccune@google.com>
+ 
+       * docs/grub.texi: Cleanup security documentation around signatures.
+ 
 +2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/fs/ext2.c (EXT2_BLOCK_SIZE): Make unsigned.
 +
 +2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/commands/gptsync.c (lba_to_chs): Use proper types rather
 +      than int.
 +
  2013-10-25  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * conf/Makefile.common (CPPFLAGS_KERNEL): Add -DGRUB_KERNEL=1.