Record merges that were already done manually on 0.10-stable.
Authored by: cboos 2006-10-13
Parent: [r3907]
Child: [r3909]
