[quilt/el6: 5/5] Merge branch 'master' into el6

[Josh Boyer]

commit 81453069adbafb2dce31826c525229cd6b820c0c
Merge: 396383a 81b08a9
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Oct 12 09:18:26 2011 -0400

    Merge branch 'master' into el6

 .gitignore                |    2 +-
 quilt-rpm-4.6-setup.patch |   17 -----------------
 quilt.spec                |   22 +++++++++++++---------
 sources                   |    2 +-
 4 files changed, 15 insertions(+), 28 deletions(-)
---
diff --cc quilt.spec
index a65dd44,ee5294d..3c256c3
--- a/quilt.spec
+++ b/quilt.spec
@@@ -64,6 -57,14 +57,17 @@@ rm -rf $RPM_BUILD_ROOT/%{_docdir
  %{_mandir}/man1/*
  
  %changelog
++* Wed Oct 12 2011 Josh Boyer <jwboyer at fedoraproject.org>
++- Update EL-6 branch and build
++
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.48-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Fri Jun 18 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.48-1
+ - New upstream release
+ - Drop upstreamed patch
+ - Update spec to drop redundant buildroot items and clean section
+ 
  * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.47-5
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild