[perl-Math-Calc-Units: 10/11] Merge branch 'master' into el6

[Paul Howarth]

commit 6e7f7f8e7116a50103714758e26000b30fe4023f
Merge: 8bd6895 70ba58d
Author: Paul Howarth <paul at city-fan.org>
Date:   Sun Apr 1 15:33:05 2012 +0100

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

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