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