merge from master

Signed-off-by: Mike O'Connor <stew@vireo.org>

diff --cc config/debian/dak.conf
Simple merge

diff --cc dak/dak.py
index aa6efdee840555190e25b9590a3700368b487e6d,981a31a95d0d52e6408c458218c012726a8229bd..15c3e1add0efcdbcccdf187ee5d1b84c1608f39a
--- 1/dak/dak.py
--- 2/dak/dak.py
+++ b/dak/dak.py
@@@ -171,10 -169,10 +171,12 @@@ def init()
           "Split queue/done into a date-based hierarchy"),
          ("stats",
           "Generate statistics"),
 +        ("calculate-shasums",
 +         "Calculate missing sha1sums and sha256sums"),
          ("bts-categorize",
           "Categorize uncategorized bugs filed against ftp.debian.org"),
+         ("add-user",
+          "Add a user to the archive"),
          ]
      return functionality
  

diff --cc dak/dakdb/update2.py
Simple merge

diff --cc dak/update_db.py
Simple merge

diff --cc daklib/utils.py
index 5cb502d6d3b51a15fc08fba8843ce9530637bda6,cb5df31ce30fd77e2c086c6266209720fbffec88..1b35feef2eb697e930152b85ca612b3f1ea9e29e
--- 1/daklib/utils.py
--- 2/daklib/utils.py
+++ b/daklib/utils.py
@@@ -37,7 -37,9 +37,10 @@@ import sta
  import apt_pkg
  import database
  import time
 +import tarfile
+ import re
+ import string
+ import email as modemail
  from dak_exceptions import *
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                      re_multi_line_field, re_srchasver, re_verwithext, \