Rev 4936: Merge the 2.0 branch tip. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-pyrex-propagation

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 4936 [merge]
revision-id: john at arbash-meinel.com-20100106185008-ak602m6fkd3fq4q9
parent: john at arbash-meinel.com-20100105072259-77xsv5gcpl7nt7ku
parent: pqm at pqm.ubuntu.com-20100106184401-mrv30dls621g1zq7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-pyrex-propagation
timestamp: Wed 2010-01-06 12:50:08 -0600
message:
  Merge the 2.0 branch tip.
-------------- next part --------------