Rev 1441: Merge in : in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1441
revision-id: robertc at robertcollins.net-20060105224859-b3a1f2be759672fc
parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
parent: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2006-01-06 09:48:59 +1100
message:
  Merge in :
    * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
      for functions that need unicode strings. (Robert Collins)
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105224446-a1ee05b67dead4fc
    parent: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: safe_unicode
    timestamp: Fri 2006-01-06 09:44:46 +1100
    message:
      An extra test for John.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060105223059-a8b64f7b47cf12fb
    parent: robertc at robertcollins.net-20060105214856-c88e035070de8465
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: safe_unicode
    timestamp: Fri 2006-01-06 09:30:59 +1100
    message:
       * bzrlib.osutils.safe_unicode now exists to provide parameter coercion
         for functions that need unicode strings. (Robert Collins)