[perl-Spreadsheet-ParseExcel: 6/9] Merge branch 'master' into el6

[Paul Howarth]

commit b5efa1fbb1e624f4da9e18b3efd1eb13740a01de
Merge: d40d67f d66f984
Author: Paul Howarth <paul at city-fan.org>
Date:   Mon Aug 22 13:54:51 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                       |    2 +-
 perl-Spreadsheet-ParseExcel.spec |  123 +++++++++++++++++++++++++++++++-------
 sources                          |    2 +-
 3 files changed, 103 insertions(+), 24 deletions(-)
---