[perl-Sub-Exporter: 10/11] Merge branch 'master' into el5

[Paul Howarth]

commit a160af2f268f96714a47db4804dde3044b699804
Merge: beac20a 77b0c44
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Mar 18 10:45:27 2012 +0000

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Sub-Exporter.spec

 .gitignore             |    2 +-
 perl-Sub-Exporter.spec |  143 ++++++++++++++++++++++++++++++++++--------------
 sources                |    2 +-
 3 files changed, 104 insertions(+), 43 deletions(-)
---