beremiz

merged in cherry-picked service discovery changes

2009-08-12, b taylor
53b00ff1b2d6
merged in cherry-picked service discovery changes
(binary:image/png)