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

[stevetraylen]

commit 203c5e1b00757f5c108411dc4f6cabba082a3e90
Merge: 4bb420f 887ac45
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Aug 31 12:04:27 2010 +0200

    Merge branch 'master' into f13
    
    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..85a14ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--Directory-Queue-0.5.tar.gz
 -/Directory-Queue-1.0.tar.gz
++Directory-Queue-1.0.tar.gz