beremiz

beremiz/tests/win32/test_master/
merged in cherry-picked service discovery changes

2009-08-12, b taylor
53b00ff1b2d6