Wed, 12 Aug 2009 16:09:00 -0600merged in cherry-picked service discovery changes
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:09:00 -0600] rev 376
merged in cherry-picked service discovery changes