Merge branch 'merge'

* merge:
  don't try to remove file --searchdirs, prune some paths from messages

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --cc tools/debianqueued-0.9/ChangeLog
index 117274ab6476261a1773a133e3b2adde9de4e48e,01bf71fcf448f78d59e118d1ea43e27f8cdf3e65..4464d00259655a9b55c4d7568e2466b4e00fae2f
--- 1/tools/debianqueued-0.9/ChangeLog
--- 2/tools/debianqueued-0.9/ChangeLog
+++ b/tools/debianqueued-0.9/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
 +2008-09-20  Joerg Jaspert  <joerg@debian.org>
 +
 +      * Queue.README (Version): Update the text to match reality with
 +      DEFERRED/DELAYED and the removed mv command
 +
+ 2008-09-20  Thomas Viehmann  <tv@beamnet.de>
+ 
+       * debianqueued: Minor fixes on .commands processing.
+ 
  2008-09-15  Joerg Jaspert  <joerg@debian.org>
  
        * config: Use 15 delayed dirs. Also change maintainer_mail to