Rev 4857: (vila) Merge 2.0 into 2.1 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4857 [merge]
revision-id: pqm at pqm.ubuntu.com-20100917110005-us7utppp0b50qyk7
parent: pqm at pqm.ubuntu.com-20100913083159-449hvur7t494zck9
parent: v.ladeuil+lp at free.fr-20100917100228-6ypvxl4n03m72m21
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2010-09-17 12:00:05 +0100
message:
  (vila) Merge 2.0 into 2.1 (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
=== modified file 'NEWS'
--- a/NEWS	2010-09-13 08:31:59 +0000
+++ b/NEWS	2010-09-17 10:02:28 +0000
@@ -514,7 +514,11 @@
 bzr 2.0.6
 #########
 
-:2.0.6: NOT RELEASED YET
+:2.0.6: 2010-09-17
+
+The sixth release in our 2.0 series addresses several user-inconvenience
+bugs.  None are critical, but upgrading is recommended for all users on
+earlier 2.0 releases.
 
 Bug Fixes
 *********