[perl-File-MMagic/el6: 7/9] Merge branch 'el5' into el4

[Paul Howarth]

commit 8dcf1a7740012132761fc09427ba9043a92b070e
Merge: 303e7ea 7049139
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 20 12:33:45 2011 +0100

    Merge branch 'el5' into el4
    
    Conflicts:
    	perl-File-MMagic.spec

 perl-File-MMagic.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --cc perl-File-MMagic.spec
index 47d28a7,77452eb..5b82f73
--- a/perl-File-MMagic.spec
+++ b/perl-File-MMagic.spec
@@@ -51,8 -51,8 +51,8 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-2.el4
- - Build for EL4
 -* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-2.el5
 -- Build for EL5
++* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-2
++- Build for EPEL 4/5
  - Fix minor specfile issues
  
  * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.27-1