Viewing all changes in revision 2420.2.2.

Committer: Andrew Bennetts
Date: 2007-04-26 08:15:40 UTC
mfrom: <a title="Merged From 2018.18.25" href="/~bzr-pqm/bzr/bzr.dev/revision/2018.18.25?remember=2493.2.6">(2018.18.25 hpss-faster-copy)
mto: <a title="Merged In 2420.1.21" href="/~bzr-pqm/bzr/bzr.dev/revision/2420.1.21?remember=2493.2.6">(2420.1.21 bzr.http.auth)
mto: This revision was merged to the branch mainline in revision 2463 .
Revision ID: andrew.bennetts@canonical.com-20070426081540-36glj2kouoldc866

Merge tarball branch that's already with PQM, resolving conflicts.

added added

removed removed