Rev 401: Merge trunk. in http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

------------------------------------------------------------
revno: 401 [merge]
revision-id: robertc at robertcollins.net-20100219222805-03rpbumtkkx54xv4
parent: robertc at robertcollins.net-20100201205135-r8fy14mnaale7whu
parent: james.westby at canonical.com-20100219175045-hplgti30d6uo5hbg
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Sat 2010-02-20 09:28:05 +1100
message:
  Merge trunk.
added:
  bzrtools_bzrtools.py           bzrtools_bzrtools.py-20100204233246-877z6ad7wxln94hp-1
  bzrtools_import.py             bzrtools_import.py-20091225110630-djynb152jiihq7n5-1
  dh_make.py                     dh_make.py-20100209173800-daxd9ozp7518xp4k-1
  merge_changelog.py             merge_changelog.py-20100128102539-f91i2beb1zgzfn86-1
  tests/test_dh_make.py          test_dh_make.py-20100209173800-daxd9ozp7518xp4k-2
  tests/test_merge_changelog.py  test_merge_changelog-20100128110103-5ijww61suvpfp8g7-1
modified:
  README                         readme-20060917150309-xbse5n20p61fw62z-1
  __init__.py                    __init__.py-20051118014441-2307aeda5d9b3cae
  cmds.py                        commands.py-20090212140847-xar6smw4yyx06egs-1
  config.py                      config.py-20060816235838-wk9rk801k2fdaihy-3
  debian/changelog               changelog-20060815213430-chhbjkje3exq7kj6-3
  debian/control                 control-20060815213430-chhbjkje3exq7kj6-6
  debian/doc-base                docbase-20070113224131-yjfygusq4ew53ph3-1
  directory.py                   directory.py-20080718143107-k0qct8ewk2vtfrlm-1
  import_dsc.py                  import_dsc.py-20070624210539-6nr2xvw6kqbh4bzc-1
  repack_tarball.py              repack_tarball.py-20070623103032-17pnzojnvch8hgd8-1
  tests/__init__.py              __init__.py-20070227200631-dcfgd9vfbozyyhhi-2
  tests/test_import_dsc.py       test_import_dsc.py-20070624210539-6nr2xvw6kqbh4bzc-3
  tests/test_upstream.py         test_upstream.py-20090304013615-xb2moxvgjhxh5te9-1
  tests/test_util.py             test_util.py-20070617192605-fl6jhvv6ldtxz5ze-1
  upstream.py                    upstream.py-20090219103202-594x435451s8tu1g-1
  util.py                        util.py-20060816235838-wk9rk801k2fdaihy-4

Diff too large for email (2835 lines, the limit is 1000).