Viewing all changes in revision 6015.29.1.

Committer: John Arbash Meinel
Date: 2011-08-30 10:54:28 UTC
mfrom: <a title="Merged From 5609.48.9" href="/~bzr-pqm/bzr/bzr.dev/revision/5609.48.9?remember=6015.29.1">(5609.48.9 2.3)
mto: <a title="Merged In 6015.28.2" href="/~bzr-pqm/bzr/bzr.dev/revision/6015.28.2?remember=6015.29.1">(6015.28.2 2.4)
mto: This revision was merged to the branch mainline in revision 6124 .
Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11

Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

added added

removed removed