FieldRefactoring: merged [5524:5688/trunk] via svnmerge.
Authored by: cboos 2007-06-14
Parent: [r5688]
Child: [r5690]