merge from master

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

diff --cc dak/update_db.py
Simple merge

diff --cc daklib/dbconn.py
Simple merge

diff --cc daklib/utils.py
index ec1cd36686f8b3f943723b430f9850a1a061e2ab,a6660ae1b9e291f89306dbc4ab1b032a09491ba5..21446fbe9f435685f8c2dcd0c2c8585f7db1b41c
--- 1/daklib/utils.py
--- 2/daklib/utils.py
+++ b/daklib/utils.py
@@@ -45,9 -45,9 +45,10 @@@ from dak_exceptions import 
  from textutils import fix_maintainer
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                      re_multi_line_field, re_srchasver, re_taint_free, \
 -                    re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource
 +                    re_gpg_uid, re_re_mark, re_whitespace_comment, re_issource, \
 +                    re_is_orig_source
  
+ from formats import parse_format, validate_changes_format
  from srcformats import get_format_from_string
  from collections import defaultdict