Merge branch 'new-autogen'

diff --cc ChangeLog
index 4bbec86,88b3c83..630bfa9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,9 +1,21 @@@
 -2013-11-26  Colin Watson  <cjwatson@ubuntu.com>
++2013-11-27  Colin Watson  <cjwatson@ubuntu.com>
+ 
+       Generate Makefile.*.am directly from gentpl.py, eliminating the use
+       of Autogen.  The Autogen definitions files remain intact as they
+       offer a useful abstraction.
+ 
 +2013-11-27  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      Add grub_util_disable_fd_syncs call to turn grub_util_fd_sync calls
 +      into no-ops, and use it in programs that copy files but do not need
 +      to take special care to sync writes (grub-mknetdir, grub-rescue,
 +      grub-mkstandalone).
 +
 +2013-11-26  Colin Watson  <cjwatson@ubuntu.com>
 +
 +      * tests/util/grub-fs-tester.in: Execute xorriso from $PATH rather
 +      than hardcoding /usr/local/bin/xorriso.
 +
  2013-11-26  Vladimir Serbinenko  <phcoder@gmail.com>
  
        Add PCI command activation to all PCI drivers as required for coreboot