rework-testing: clear the svn:mergeinfo prop on Makefile.cfg.sample.
Authored by: cboos 2009-05-24
Parent: [r8237]
Child: [r8239]