[perl-DateTime-Format-Excel/el6/master: 7/7] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit 5acae7333fc34be97e8edffe6e04d5b54b28851b
Merge: 1d97ef8 04e5088
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Jan 2 21:51:33 2011 +0100

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 perl-DateTime-Format-Excel-0.2901-versioning.patch |   37 ---------
 perl-DateTime-Format-Excel-0.31-versioning.patch   |   48 +++++++++++
 perl-DateTime-Format-Excel.spec                    |   83 +++++++++++---------
 sources                                            |    2 +-
 5 files changed, 96 insertions(+), 76 deletions(-)
---