Merge branch 'master' into dbtests

Conflicts:
	tests/dbtest_contents.py

diff --cc tests/dbtest_contents.py
index 1cfe46b79276afedbedbccd65d8f544be116d234,49db68489e0e084f6dba79e8acbdf379140381cd..b651204216345d681f7c0548eb15c37001d73250
--- 1/tests/dbtest_contents.py
--- 2/tests/dbtest_contents.py
+++ b/tests/dbtest_contents.py
@@@ -154,8 -154,8 +154,10 @@@ class ContentsTestCase(DBDakTestCase)
              self.otype['udeb'], self.comp['main'])
          self.assertEqual('tests/fixtures/ftp/squeeze/main/Contents-i386.gz', \
              cw.output_filename())
+         # test delete cascading
+         self.session.delete(self.binary['hello_2.2-1_i386'])
 +        # test unicode support
 +        self.binary['hello_2.2-1_i386'].contents.append(BinContents(file = '\xc3\xb6'))
          self.session.commit()
  
      def test_scan_contents(self):