Rev 4804: (jam) update to a real 2.1.0rc2 release in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4804 [merge]
revision-id: pqm at pqm.ubuntu.com-20100129100124-va4vnmro5vyjfods
parent: pqm at pqm.ubuntu.com-20100129093027-2abks31u4425bl59
parent: john at arbash-meinel.com-20100129091330-ichhranalyh1r12i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2010-01-29 10:01:24 +0000
message:
  (jam) update to a real 2.1.0rc2 release
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2010-01-29 08:56:26 +0000
+++ b/NEWS	2010-01-29 09:13:30 +0000
@@ -5,12 +5,15 @@
 .. contents:: List of Releases
    :depth: 1
 
-bzr 2.1.0rc2 (not released yet)
-###############################
+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
 ***********
 
@@ -22,6 +25,7 @@
   helper class ``bzrlib.merge.ConfigurableFileMerger``.
   (Robert Collins, John Arbash Meinel, #513822)
 
+
 bzr 2.1.0rc1
 ############