SearchRefactoring: merged [5641:5689/trunk] via svnmerge.
Authored by: cboos 2007-06-14
Parent: [r5689]
Child: [r5691]