[fetchlog/f16: 7/7] Merge branch 'master' into f16

[Paul Wouters]

commit 8b7a7b1a5b1524b2ba4b1ec3100d79a00b627d59
Merge: 0f015a4 f79fd5a
Author: Paul Wouters <paul at nohats.ca>
Date:   Tue Jul 3 21:35:45 2012 -0400

    Merge branch 'master' into f16
    
    Conflicts:
    	fetchlog-build.patch
    	fetchlog.spec

 fetchlog-1.4-tests.patch |   21 +++++++++++++++++++++
 fetchlog-1.4-write.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 fetchlog-build.patch     |    2 +-
 fetchlog.spec            |    9 ++++++++-
 4 files changed, 73 insertions(+), 2 deletions(-)
---
diff --cc fetchlog.spec
index c9df34e,9574a46..1fdd35a
--- a/fetchlog.spec
+++ b/fetchlog.spec
@@@ -45,10 -49,14 +49,13 @@@ rm -rf %{buildroot
  %{_mandir}/*/*
  
  %changelog
+ * Tue Jul  3 2012 Paul Wouters <pwouters at redhat.com> - 1.4-2
 -- Updated to 1.4-1 (rhbz#608241)
 -- Added patch for -Wunused and patch for bad CFLAGS
+ - write() patch with test case fixups
+ 
 -* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 -
 +* Tue Feb 28 2012 Paul Wouters <pwouters at redhat.com> - 1.4-1
 +- Updated to 1.4-1 (rhbz#608241)
 +- Added patch for -Wunused and patch for bad CFLAGS
- 
++ 
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild