[perl-Devel-Cycle/el4/master: 6/6] Merge branch 'el4' into el5

[Paul Howarth]

commit 2eb04c9ff29e767135b23ee381f1a92325fbca44
Merge: b9abc14 3616716
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Mar 22 16:24:58 2011 +0000

    Merge branch 'el4' into el5
    
    Conflicts:
    	.gitignore

 .gitignore |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---