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

[Xavier Bachelot]

commit ee2e2ea4c237e0efb16d31af4d57bf52b17c1c0a
Merge: f8cada9 45aac7d
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Tue Sep 7 21:16:50 2010 +0200

    Merge branch 'master' into el4
    
    Conflicts:
    	.gitignore

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