woops, removing some left over conflict markers
Authored by: cboos 2008-07-25
Parent: [r7403]
Child: [r7405]