[dak/master] Revert "Merge branch 'merge'"

[Joerg Jaspert <joerg@debian.org>]

This reverts commit a1e87687d8e78a910fedf1e90830d7882a22a555.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 dak/init_db.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dak/init_db.py b/dak/init_db.py
index 31a2a5a..af0a03b 100755
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -23,8 +23,8 @@ import psycopg2, sys
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import DBConn
-from daklib.config import Config
+from daklib.DBConn import DBConn
+from daklib.Config import Config
 
 ################################################################################
 
-- 
1.5.6.5