Merge with brendan

diff --cc ChangeLog
index abbf3de1b26ff26863b4b37eefb29a0e17fb4b2e,898c795b2d364d042d748b3d48d982d980eaf9bd..b267c1912304ef378ab25e76a6cd97274ffb6749
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,20 +1,18 @@@
 -2008-07-24 12:15 -0400  Brendan Cully  <brendan@kublai.com>  (0d9c24dea7d0)
++2008-07-21 10:24 -0400  Aron Griffis  <agriffis@n01se.net>  (96b0dd25a550)
+ 
 -      * copy.c: Remove variables no longer used since [7729b1ad530c]
++      * copy.h, mutt.h: noop cleanup: move mutt_copy_header flags to copy.h
+ 
 -      * configure.ac: Disable GCC long long warnings with
 -      -pedantic. Closes #2823. Thanks to Aron Griffis for the
 -      suggestion.
++      Noticed while reading that these flags are better defined in copy.h
++      than mutt.h. Builds without warnings.
+ 
 -2008-07-22 16:30 +0200  Vincent Lefevre  <vincent@vinc17.org>  (e27d7ce09c40)
++      Signed-off-by: Aron Griffis <agriffis@n01se.net>
+ 
 -      * doc/manual.xml.head, init.h: Fix typos in manual.xml.head and
 -      init.h. Closes #3096.
++2008-07-24 16:19 -0400  Brendan Cully  <brendan@kublai.com>  (0e2f9189a1dd)
+ 
 -2008-07-21 11:53 +0200  Rocco Rutte  <pdmef@gmx.net>  (5511a52bbc9f)
++      * ChangeLog, m4/codeset.m4, m4/iconv.m4: Fix m4 serial numbers to
++      avoid aclocal 1.10 warnings
+ 
 -      * init.h: Use itemized lists for listing possible sort config
 -      settings.
 +2008-07-21 11:42 +0200  Rocco Rutte  <pdmef@gmx.net>  (7e6d98886cce)
  
        * doc/makedoc.c: makedoc: Add ".ie" and ".il" to support itemized
        lists.