[MERGE] lsprof branch

[John Arbash Meinel]

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

Robey Pointer wrote:
> 
> On 1 Jul 2006, at 9:34, John Arbash Meinel wrote:
> 
>> 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.
> 
> Yeah, looks like a simple fix.  Merged, resolved, and pushed.
> 
> robey

Submitted, and accepted.
I just couldn't merge it into jam-integration because I'm waiting for a
review of the two-phase locking stuff.

John
=:->

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

iD8DBQFEpxkiJdeBCYSNAAMRApT0AKDDLZctC0x0sLhVCHc7eYWYevM94ACg2QYg
I21GoXaGDe57hjeeu66X3uA=
=X8Vy
-----END PGP SIGNATURE-----