Viewing all changes in revision 4981.1.2.

Committer: John Arbash Meinel
Date: 2010-01-21 20:12:43 UTC
mfrom: <a title="Merged From 4634.119.10" href="/~bzr-pqm/bzr/bzr.dev/revision/4634.119.10?remember=5401">(4634.119.10 2.0.4-dev)
mto: <a title="Merged In 4797.2.4" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.2.4?remember=5401">(4797.2.4 2.1)
mto: This revision was merged to the branch mainline in revision 4982 .
Revision ID: john@arbash-meinel.com-20100121201243-q3ptdkmf8udx1ltw

Merge the 2.0.4 branch, bringing in the NEWS updates.

added added

removed removed