[PATCH] New CT merge approach

[Michael Gerz]

I changed the CT merge strategy according to the previous discussion.
This patch merges two adjacent changes if they were made by the same 
author (the change time is not regarded).

OK to commit?

Michael