Rev 4990: Merge 2.1.0rc2 in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4990 [merge]
revision-id: john at arbash-meinel.com-20100129110930-y6ins0x1phadj5c7
parent: john at arbash-meinel.com-20100129082847-pnx07l2xcbenkcrs
parent: pqm at pqm.ubuntu.com-20100129100124-va4vnmro5vyjfods
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2010-01-29 05:09:30 -0600
message:
  Merge 2.1.0rc2
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-01-29 08:28:47 +0000
+++ b/NEWS	2010-01-29 11:09:30 +0000
@@ -36,11 +36,14 @@
 *******
 
 
-bzr 2.1.0rc2 (not released yet)
-###############################
-
-:Codename: 
-:2.1.0rc2: ???
+bzr 2.1.0rc2
+############
+
+:Codename: after the bubbles
+:2.1.0rc2: 2010-01-29
+
+This is a quick-turn-around to update a small issue with our new per-file
+merge hook. We expect no major changes from this to the final 2.1.0.
 
 API Changes
 ***********
@@ -53,6 +56,7 @@
   helper class ``bzrlib.merge.ConfigurableFileMerger``.
   (Robert Collins, John Arbash Meinel, #513822)
 
+
 bzr 2.1.0rc1
 ############