Rev 4900: Merge the tip of the bzr.stable branch. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-dev

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 4900 [merge]
revision-id: john at arbash-meinel.com-20091214231254-julgsodmd7ziktyk
parent: john at arbash-meinel.com-20091214205054-n4g44rxpuhhfnqq5
parent: pqm at pqm.ubuntu.com-20091214223015-02khbbtpzqbxlglm
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-dev
timestamp: Mon 2009-12-14 17:12:54 -0600
message:
  Merge the tip of the bzr.stable branch.
-------------- next part --------------