[MERGE] 'merge_sort' for 'per-file-log'

[John Arbash Meinel]

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

This is the same basic patch as before, only with Ian's comments addressed.

I would certainly like to have Robert's feedback on this, as I think he
is very close to understanding the real details of the change, as well
as the implications.

This is not a strict supersede of the 'simple' fix, so I'll manually
cancel that one if this one gets merged.

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

iEYEARECAAYFAkjX/XQACgkQJdeBCYSNAANPEgCbBYuBs2H9VnupJ5HnAlHxLaqn
orwAniw5AeCvDWGaZXslSVLc7SkTCrAZ
=KLtW
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: lighter_log_file.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20080922/6cf2e765/attachment-0001.diff