[perl-common-sense: 6/6] Merge branch 'master' into el6

[Paul Howarth]

commit 7d1987cd801b30ce17b9ee315d5001ba1cd3d98a
Merge: 3fc1973 69b4235
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Mar 24 20:37:01 2012 +0000

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-common-sense.spec
    	sources

 .gitignore             |    2 +-
 perl-common-sense.spec |  112 +++++++++++++++++++++++++++++++----------------
 sources                |    2 +-
 3 files changed, 76 insertions(+), 40 deletions(-)
---