Rev 1423: Merge from mbp AGAIN. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1423
revision-id: robertc at robertcollins.net-20051206082223-46591e053716a9ce
parent: robertc at robertcollins.net-20051206050437-700e48df5e094d7f
parent: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2005-12-06 19:22:23 +1100
message:
  Merge from mbp AGAIN.
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051206051943-e7422764401f2d2e
    parent: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
    parent: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-06 16:19:43 +1100
    message:
      [merge] jamesh, unicode fixes
    ------------------------------------------------------------
    merged: james.henstridge at canonical.com-20051202033643-11c50c1f530b3e13
    parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
    committer: James Henstridge <james.henstridge at canonical.com>
    branch nick: bzr.smallfixes
    timestamp: Fri 2005-12-02 11:36:43 +0800
    message:
      Don't encode unicode messages to UTF-8 in mutter() (the stream writer does it).
      
      Use a codec wrapped log file in tests to match the real environment.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051206051616-5952d343e0ea9a45
    parent: mbp at sourcefrog.net-20051205120437-b6b3e28a9ea0fae5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-06 16:16:16 +1100
    message:
      Remove deleted test of basicio from list of tests