merge back in source merges to fix the broken repository

diff --cc debian/changelog
index 5fbd4b180876f29f4ca805c6b122d0360925c7f4,91b999214c0ba89cb7b71b96d76a7de455ec0f53..7929ba2e6ba1c9a137a492c5cfe9f5da8b37b975
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -113,9 -113,11 +113,13 @@@ debbugs (2.4.2) UNRELEASED; urgency=lo
        UTF8 material. (closes: #364026)
      - Add links to Closes: text for closed bugs. (closes: #320986)
      - Add X-$gProject-PR-Source: line (closes: #219230)
-   
 +    - Use the %cats data structure properly in pkgreport.cgi
 +      (closes: #367514)  
 -  
+     - Document nnn.*@foobar addresses (closes: #188670)
+     - Support cloned bugs in control blocking (closes: #337329)
+     - Indicate which bugs are blocked after blocking (closes: #367496)
+     - Obey package for usertags (closes: #376528)
++
    
   -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100