Viewing all changes in revision 923.

Committer: Martin Pool
Date: 2005-07-16 00:07:40 UTC
mfrom: <a title="Merged From 909.1.5" href="/~bzr-pqm/bzr/bzr.dev/revision/909.1.5?remember=970">(909.1.5)
Revision ID: mbp@sourcefrog.net-20050716000740-f2dcb8894a23fd2d

- merge aaron's bugfix branch
up to abentley@panoramicfeedback.com-20050715134354-78f2bca607acb415

added added

removed removed