merged heads

diff --combined debian/changelog
index 35c6d8c,5af73f0..f8172e7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,8 @@@
  iserv-mod-error-reporter (10.03.06-1) testing; urgency=low
  
-   * Non-maintainer upload.
-   * test 
+   * fixed the fix...
  
 - -- Roland Hieber <rohieb@rohieb.name>  Sat, 06 Mar 2010 06:22:12 +0100
 + -- Roland Hieber (Package Signing Key) <roland.hieber@wilhelm-gym.net>  Sat, 06 Mar 2010 03:59:20 +0100
  
  iserv-mod-error-reporter (10.03.05-1) testing; urgency=low