[perl-Exception-Base/el6: 8/8] Merge branch 'master' (early part) into el6

[Paul Howarth]

commit 61995d254f6d8431f4397facd4f25d0c2e274ed1
Merge: 8b88d49 49cfb09
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 20 15:33:00 2011 +0100

    Merge branch 'master' (early part) into el6
    
    Conflicts:
    	.gitignore

 .gitignore               |    2 +-
 perl-Exception-Base.spec |   21 +++++++++++++++++++--
 sources                  |    2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 4a0f3bb,d7318e9..34d1c2b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- Exception-Base-0.21.tar.gz
 -Exception-Base-0.24.tar.gz
 -/Exception-Base-0.2401.tar.gz
++/Exception-Base-[0-9.]*.tar.gz