Viewing all changes in revision 1393.1.21.

Committer: Martin Pool
Date: 2005-09-30 06:39:42 UTC
mfrom: <a title="Merged From 1185.10.11" href="/~bzr-pqm/bzr/bzr.dev/revision/1185.10.11?remember=2493.2.5">(1185.10.11)
mto: <a title="Merged In 1185.14.2" href="/~bzr-pqm/bzr/bzr.dev/revision/1185.14.2?remember=2493.2.5">(1185.14.2)
mto: This revision was merged to the branch mainline in revision 1396 .
Revision ID: mbp@sourcefrog.net-20050930063942-3eab86500bffba49

- merge merge and export fixes from aaron
aaron.bentley@utoronto.ca-20050930040234-71c1a151f795e806

added added

removed removed