[perl-Sub-Name: 11/15] Merge branch 'master' into el6

[Paul Howarth]

commit 0d2c28941ee2502f620f538ce6249160838a7dca
Merge: e10b0a8 1d2c5d4
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Feb 17 18:55:40 2012 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore         |    1 +
 perl-Sub-Name.spec |   41 ++++++++++++++++++++++++++++++++---------
 sources            |    2 +-
 3 files changed, 34 insertions(+), 10 deletions(-)
---