Viewing all changes in revision 4797.40.1.

Committer: Martin Pool
Date: 2010-03-23 06:45:56 UTC
mfrom: <a title="Merged From 4634.139.3" href="/~bzr-pqm/bzr/bzr.dev/revision/4634.139.3?remember=4659">(4634.139.3 2.0)
mto: <a title="Merged In 4797.33.7" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.33.7?remember=4659">(4797.33.7 2.1)
mto: This revision was merged to the branch mainline in revision 5118 .
Revision ID: mbp@canonical.com-20100323064556-vizh4wom6cbaxz1s

merge 2.0 to 2.1, including cross-format-fetch warning

added added

removed removed