[ack/el4/master: 27/27] Merge branch 'el5' into el4

[Ian Burrell]

commit dbd4b28e73b63f50f364ef63178744e6ae9fc618
Merge: 45b9a67 657f81b
Author: Ian Burrell <imb at rentrak.com>
Date:   Thu Sep 2 21:58:07 2010 -0700

    Merge branch 'el5' into el4
    
    * el5: (24 commits)
      * Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again
      dist-git conversion
      dist-git conversion
      dist-git conversion
      Update to 1.92
      - Mass rebuild with perl-5.12.0
      Initialize branch EL-6 for ack
      - rebuild against perl 5.10.1
      Fix typo that causes a failure to update the common directory. (releng     #2781)
      Fix typo that causes a failure to update the common directory. (releng     #2781)
      Fix typo that causes a failure to update the common directory. (releng     #2781)
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
      Update to 1.86
      Update to 1.86
      update to 1.78
      update to 1.78
      Rebuild for new perl
      Update to 1.76
      Update to 1.76
      ...
    
    Conflicts:
    	ack.spec
    	sources

 ack.spec |    6 ++++--
 sources  |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---