merge from mainline

diff --cc dak/transitions.py
index 5c81e03aca1829af9dbd933efc0bc2c277b35779,7133d8413fda2e1da1bbc98e79063d783d8fe9fe..a37dbef9f1da7b8bb27ec3d388114af47b68a214
--- 1/dak/transitions.py
--- 2/dak/transitions.py
+++ b/dak/transitions.py
@@@ -25,8 -25,9 +25,9 @@@
  
  import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
  import apt_pkg
 -import daklib.database as database
 -import daklib.utils as utils
 +from daklib import database
 +from daklib import utils
+ from daklib.dak_exceptions import TransitionsError
  import syck
  
  # Globals