Rev 4935: Bring in the latest bzr.dev to resolve the criss-cross problem 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: 4935 [merge]
revision-id: john at arbash-meinel.com-20100105072259-77xsv5gcpl7nt7ku
parent: john at arbash-meinel.com-20100105052842-pegkjxr8pwec0ovn
parent: pqm at pqm.ubuntu.com-20100105045349-91sjr8vmex9iy8ex
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-pyrex-propagation
timestamp: Tue 2010-01-05 01:22:59 -0600
message:
  Bring in the latest bzr.dev to resolve the criss-cross problem
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-05 05:09:45 +0000
+++ b/NEWS	2010-01-05 07:22:59 +0000
@@ -8,7 +8,7 @@
 bzr 2.1.0rc1 (not released yet)
 ###############################
 
-:Codename: mysterioso
+:Codename: the 'new' stable
 :2.1.0rc1: 2009-01-06 (expected)
 
 Compatibility Breaks
@@ -127,7 +127,7 @@
 ############################
 
 :Codename:
-:2.0.4: ???
+:2.0.4: smooth sailing
 
 Compatibility Breaks
 ********************