SearchRefactoring: merged [5528:5640/trunk]
Authored by: cboos 2007-06-08
Parent: [r5640]
Child: [r5642]