Merge remote branch 'mhy/master' into merge

Conflicts:
	daklib/utils.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --cc daklib/utils.py
index 0b2d8c87eca2bfbcc5933b603159ffffc0d568b8,02558deb38fd72d3a39588c9f0c9fe256a5561e3..c0a3bdff2936333d87385f473f4b031df08de180
--- 1/daklib/utils.py
--- 2/daklib/utils.py
+++ b/daklib/utils.py
@@@ -39,7 -39,7 +39,7 @@@ import r
  import email as modemail
  import subprocess
  
- from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type
 -from dbconn import DBConn, get_architecture, get_component, get_suite, Keyring
++from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type, Keyring
  from dak_exceptions import *
  from textutils import fix_maintainer
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \