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

diff --cc ChangeLog
index 80145fa6948403cc8846b35318ba85e142e7dbdb,a111a42ffe1dacb0978053733b1d54f4eaa1ed8b..acd4b48876896c10d777776f2256f6f220776d58
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,16 +1,20 @@@
+ 2013-11-13  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+ 
+       Fix make clean.
+ 
+       * Makefile.am: Remove build-grub-* in make clean.
+ 
+ 2013-11-13  Paulo Flabiano Smorigo  <pfsmorigo@br.ibm.com>
+ 
+       New files to gitignore.
+ 
+       * .gitignore: Add build-grub-gen-asciih, build-grub-gen-widthspec,
+       build-grub-mkfont, and grub-emu-lite. Remove .bzrignore.
+ 
 +2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
 +
 +      * grub-core/kern/arm/misc.S: Make thumb2-compatible.
 +
  2013-11-13  Leif Lindholm <leif.lindholm@linaro.org>
  
        * .gitignore: fix rules for .dep* and add *.a post git migration