[perl-DateTime-Format-ICal/el5/master: 12/12] Merge branch 'master' into el5

[Xavier Bachelot]

commit 55c72281f0b99d4736baba1b96406feb6eccfa5e
Merge: 5e4c8ad 45aac7d
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Tue Sep 7 21:03:47 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

 perl-DateTime-Format-ICal.spec |   37 ++++++++++++++++++++++++++++++++-----
 sources                        |    2 +-
 2 files changed, 33 insertions(+), 6 deletions(-)
---