[perl-Math-Calc-Units: 9/11] Merge branch 'master' into el5

[Paul Howarth]

commit 70ba58d5c1de85fe7738c03f87d8b0ce7c59ef16
Merge: 510c5cf d757da2
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Apr 1 15:31:50 2012 +0100

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Math-Calc-Units.spec

 .gitignore                |    2 +-
 perl-Math-Calc-Units.spec |   32 ++++++++++++++++++++++----------
 2 files changed, 23 insertions(+), 11 deletions(-)
---