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

[Robert Scheck]

commit db1ff1e6cad949018dc60974b68afea66f04e7e2
Merge: 3972ebf 04e5088
Author: Robert Scheck <robert(a)fedoraproject.org&gt;
Date:   Sun Jan 2 21:50:28 2011 +0100

    Merge remote branch 'origin/master' into f13
    
    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                    |   80 +++++++++++---------
 sources                                            |    2 +-
 5 files changed, 93 insertions(+), 76 deletions(-)
---