Rev 5373: Merge the official 2.2 commit in http://bazaar.launchpad.net/~jameinel/bzr/2.3b1-dev

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.3b1-dev

------------------------------------------------------------
revno: 5373 [merge]
revision-id: john at arbash-meinel.com-20100806204556-9y7b31h0awy28ee3
parent: john at arbash-meinel.com-20100806201105-818gtrl77hh0xw70
parent: pqm at pqm.ubuntu.com-20100806204042-ayjfxve413tyg456
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.3b1-dev
timestamp: Fri 2010-08-06 15:45:56 -0500
message:
  Merge the official 2.2 commit
-------------- next part --------------