[ack/f12/master: 7/7] Merge branch 'f14' into f12

[Ian Burrell]

commit 3950a7758fe7bfaae965ae6ed8e616269dec9190
Merge: 66a1d4d f10719c
Author: Ian Burrell <imb at rentrak.com>
Date:   Thu Sep 2 21:31:10 2010 -0700

    Merge branch 'f14' into f12
    
    * f14:
      * Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again
      dist-git conversion
      Update to 1.92
      - Mass rebuild with perl-5.12.0
      - rebuild against perl 5.10.1
      Fix typo that causes a failure to update the common directory. (releng     #2781)
    
    Conflicts:
    	.gitignore

 ack.spec |   17 ++++++++++++++---
 sources  |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---