[perl-SUPER: 9/11] Merge branch 'master' into el5

[Paul Howarth]

commit 56114997e4695b33bbd4ce6ef7903239438c6125
Merge: 05e667c f1c3082
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Mar 6 10:52:07 2012 +0000

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-SUPER.spec
    	sources

 .gitignore         |    2 +-
 filter-provides.sh |    3 --
 perl-SUPER.spec    |   66 +++++++++++++++++++++++++++++++++++++++++----------
 sources            |    2 +-
 4 files changed, 55 insertions(+), 18 deletions(-)
---