merge with master

diff --combined daklib/dbconn.py
index 21bcbb17c33067abb53bee037efc1e136e07d2c4,9770cf84dace77760eb297f12437aa0a01ab333c..b29137221672d7f698fd7459a1f12c0a2ff1c630
--- 1/daklib/dbconn.py
--- 2/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@@ -203,8 -203,8 +203,8 @@@ class DBConn(Singleton)
          Returns database id for given override C{type}.
          Results are kept in a cache during runtime to minimize database queries.
  
-         @type type: string
-         @param type: The name of the override type
+         @type override_type: string
+         @param override_type: The name of the override type
  
          @rtype: int
          @return: the database id for the given override type
@@@ -500,10 -500,10 +500,10 @@@
  
          @type bin_id: int
          @param bin_id: the id of the binary
-         @type fullpath: string
-         @param fullpath: the path of the file being associated with the binary
+         @type fullpaths: list
+         @param fullpaths: the list of paths of the file being associated with the binary
  
-         @return True upon success
+         @return: True upon success
          """
  
          c = self.db_con.cursor()
@@@ -514,8 -514,6 +514,8 @@@
              for fullpath in fullpaths:
                  (path, file) = os.path.split(fullpath)
  
 +                if path.startswith( "./" ):
 +                    path = path[2:]
                  # Get the necessary IDs ...
                  file_id = self.get_or_set_contents_file_id(file)
                  path_id = self.get_or_set_contents_path_id(path)
@@@ -541,7 -539,7 +541,7 @@@
          @type fullpaths: list
          @param fullpaths: the list of paths of the file being associated with the binary
  
-         @return True upon success
+         @return: True upon success
          """
  
          c = self.db_con.cursor()