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

diff --cc ChangeLog
index 98d026c,72ecf15..8ad7bcd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,26 +1,46 @@@
+ 2013-12-23  Colin Watson  <cjwatson@debian.org>
+ 
+       Update some documentation to refer to Git rather than Bazaar.
+ 
+       * docs/grub.texi (Obtaining and Building GRUB): Refer to Git rather
+       than Bazaar.
+       * po/README: Likewise.  Fix spelling mistake.
+ 
+ 2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       Don't distribute config.h.
+ 
+       * Makefile.am (platform_HEADERS): Move to ...
+       (nodist_platform_HEADERS): ... here.  Fixes gettext_strings_test
+       failure when building from a distributed tarball.
+ 
+ 2013-12-23  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * configure.ac: Fix spelling.
+       * grub-core/commands/parttool.c: Fix grammar.
+       * grub-core/disk/ldm.c: Use consistent capitalisation for "LDM
+       Embedding Partition".
+ 
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      ARM64 support for grub-mkrescue.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Install modinfo.sh to keep build information around.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * grub-core/modinfo.sh.in: Add build config information.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      ARM64 grub-file and grub-mkconfig support.
 +
 +2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      Remove leftover options defines.
 +
  2013-12-23  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * include/grub/arm64/linux.h: Remove leftovers. Add missing prefixes.

diff --cc configure.ac
Simple merge