[perl-Parse-RecDescent/el6: 5/7] Merge branch 'el6' into el5

[Paul Howarth]

commit 62d26a4f08bae3a470867f5815ab471dd7e10c8a
Merge: 1e3c683 c56840d
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 20 13:50:30 2011 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	perl-Parse-RecDescent.spec
    	sources

 .gitignore                 |    2 +-
 perl-Parse-RecDescent.spec |   25 +++++++++++++++++++------
 sources                    |    2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index a74ff41,9cd11f0..f53ff7a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Parse-RecDescent-1.96.0.tar.gz
 -Parse-RecDescent-1.962.2.tar.gz
++/Parse-RecDescent-[0-9.]*.tar.gz