Viewing all changes in revision 1185.72.2.

Committer: Daniel Silverstone
Date: 2005-11-30 15:07:10 UTC
mfrom: <a title="Merged From 1185.54.12" href="/~bzr-pqm/bzr/bzr.dev/revision/1185.54.12?remember=3782">(1185.54.12 bzr.missing)
mto: <a title="Merged In 1185.50.62" href="/~bzr-pqm/bzr/bzr.dev/revision/1185.50.62?remember=3782">(1185.50.62 bzr-jam-integration)
mto: This revision was merged to the branch mainline in revision 1554 .
Revision ID: dsilvers@digital-scurf.org-20051130150710-61c3a2757ed2d37f

Merge in aaron's new missing builtin, fix conflict over it in builtins.py

added added

removed removed