Merge branch 'master' into dbtests

diff --combined daklib/dbconn.py
index 14ed7faaa9ed9c8f5763294745a15f323fd28699,67852949fe35083dededb021e20418292315fa57..94884d5c6f1f92216ed878815673085e5049a795
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -467,11 -467,7 +467,11 @@@ __all__.append('get_archive'
  ################################################################################
  
  class BinContents(ORMObject):
 -    def properties(silf):
 +    def __init__(self, file = None, binary = None):
 +        self.file = file
 +        self.binary = binary
 +
 +    def properties(self):
          return ['file', 'binary']
  
  __all__.append('BinContents')
@@@ -2906,8 -2902,8 +2906,8 @@@ class DBConn(object)
              # The following tables have primary keys but sqlalchemy
              # version 0.5 fails to reflect them correctly with database
              # versions before upgrade #41.
-             #'changes',
-             #'build_queue_files',
+             'changes',
+             'build_queue_files',
          )
  
          tables_no_primary = (
@@@ -2921,8 -2917,8 +2921,8 @@@
              'suite_build_queue_copy',
              'udeb_contents',
              # see the comment above
-             'changes',
-             'build_queue_files',
+             #'changes',
+             #'build_queue_files',
          )
  
          views = (