[perl-Directory-Queue/el6/master: 7/7] Merge branch 'master' into el6

[stevetraylen]

commit ec675605f066eb24c8d9e34942214dbde6f3abe1
Merge: 7e1c4f3 887ac45
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Aug 31 12:09:26 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Directory-Queue.spec
    	sources

 .gitignore                |    2 +-
 perl-Directory-Queue.spec |    7 +++++--
 sources                   |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 598cf28,fa03236..de58323
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Directory-Queue-0.5.tar.gz
+ /Directory-Queue-1.0.tar.gz