Viewing all changes in revision 5050.74.1.

Committer: Martin Pool
Date: 2011-04-15 07:09:27 UTC
mfrom: <a title="Merged From 4797.85.2" href="/~bzr-pqm/bzr/bzr.dev/revision/4797.85.2?remember=5830.3.4">(4797.85.2 2.1)
mto: <a title="Merged In 5050.73.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5050.73.2?remember=5830.3.4">(5050.73.2 2.2)
mto: This revision was merged to the branch mainline in revision 5796 .
Revision ID: mbp@sourcefrog.net-20110415070927-mi1yxi4w54i9feaz

merge up 2.1; restoring python2.4 compatibility and ignoring ImportWarning

added added

removed removed