Merge commit 'sec-merge' into security

* commit 'sec-merge':
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Tell bzr that dak.py should be executable
  Use "import daklib.foo as foo" style
  Use "import daklib.foo as foo" style
  Cleanup

diff --combined ChangeLog
index e515fc65edb362cd9401bc943d05d9a7c79cb452,d939879be2e1c0f3c4158646cfba128b6caad6b9..833a64bf860063d048d7f993c9938dbf58e8c3cf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,24 +1,29 @@@
  2008-05-04  Joerg Jaspert  <joerg@debian.org>
  
+       * dak/examine_package.py: remove daklib.queue import, never used
+ 
        * dak/check_proposed_updates.py: Import stuff from daklib as
        "import daklib.foo as foo"
        * dak/clean_proposed_updates.py: likewise
        * dak/clean_queues.py: likewise
+       * dak/clean_suites.py: likewise
+       * dak/compare_suites.py: likewise
+       * dak/cruft_report.py: likewise
+       * dak/examine_package.py: likewise
+       * dak/find_null_maintainers.py: likewise
+       * dak/generate_index_diffs.py: likewise
+       * dak/generate_releases.py: likewise
+       * dak/import_archive.py: likewise
  
        * dak/check_archive.py (check_files_not_symlinks): Remove
        long-time unused and commented code. Import stuff from daklib as
        "import daklib.foo as foo"
  
 +2008-05-04  Thomas Viehmann  <tv@beamnet.de>
 +
 +      * dak/process_unchecked.py (check_signed_by_key): cater for uid_email
 +      None in sponsor notification
 +
  2008-05-03  Joerg Jaspert  <joerg@debian.org>
  
        * dak/examine_package.py: clean up pychecker warnings (merged with
@@@ -39,7 -44,6 +49,7 @@@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
 +>>>>>>> sec-merge:ChangeLog
  
  2008-05-03  Joerg Jaspert  <joerg@debian.org>