[perl-PadWalker/el5/master: 21/21] Merge branch 'el4' into el5

[Paul Howarth]

commit c2668db67acd29f453b48a65ae1053b37bd527a4
Merge: d5dacf0 7592888
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Mar 15 15:05:54 2011 +0000

    Merge branch 'el4' into el5
    
    Conflicts:
    	.gitignore

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