[perl-Sub-Name: 12/15] Merge branch 'master' into el5

[Paul Howarth]

commit bd5a9b4b942b296186e410f7a144b0f25d02f0ba
Merge: 0ceab1d 0d2c289
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Feb 17 18:58:13 2012 +0000

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

 .gitignore         |    3 +-
 perl-Sub-Name.spec |   55 +++++++++++++++++++++++++++++++++++++++++++--------
 sources            |    2 +-
 3 files changed, 49 insertions(+), 11 deletions(-)
---