Rev 4987: Merge the 2.0 tip in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dev

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-dev

------------------------------------------------------------
revno: 4987 [merge]
revision-id: john at arbash-meinel.com-20100121211421-gsyp87sao1f9rp16
parent: john at arbash-meinel.com-20100121211309-5archfb1gss3wb36
parent: pqm at pqm.ubuntu.com-20100121210215-ikrnfdaws0hldamx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-dev
timestamp: Thu 2010-01-21 15:14:21 -0600
message:
  Merge the 2.0 tip
-------------- next part --------------