[MERGE] lsprof branch

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robey Pointer wrote:
> 
> On 22 Jun 2006, at 11:58, John Arbash Meinel wrote:
> 

...

>> So maybe we want to add the 'builtins=True' call.
> 
> I just added and pushed that, in the interest of getting this branch
> landed. :)
> 
> robey

There seems to be a conflict in lsprof.py
Probably we made the same import change, and then you added another import.

Anyway, if you can merge bzr.dev, and then push again, I'll submit it to
the pqm.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEpqP+JdeBCYSNAAMRAiRXAJ0WCesA6f6wyINN6Xs6lZg3t9RZ3QCfU0u2
EfnCF3xwrmPQML/xLnYnnAo=
=8nW0
-----END PGP SIGNATURE-----