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

diff --cc ChangeLog
index 3788f8377c76871a532a7a3385699ae25d3738e5,a68d3ee570558f1ce6c3d718d46de6eb11cc9a52..2b70f0d57b7fabc8545f554c99ec9d3a75478572
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,15 +1,19 @@@
+ 2013-11-15  Andrey Borzenkov <arvidjaar@gmail.com>
+ 
+       * grub-core/Makefile.core.def (signature_test): Add missing
+       tests/signatures.h.
+ 
+ 2013-11-14  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       * util/grub-install_header: Set localedir here, since this file is
+       where it's used.
+       * util/grub-install.in: Remove setting of localedir.
+       * util/grub-mkrescue.in: Likewise.
+ 
 +2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
 +
 +      * Makefile.am (default_payload.elf): Add uhci, ohci and usb_keyboard.
 +
  2013-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
  
        * configure.ac: Move nm checks to the end.