reduce the amount of silly conflicts due to internal tree organization.

Signed-off-by: Olof Johansson <olof@lixom.net>
�~�
�Dx