Wed, 12 Aug 2009 16:09:00 -0600 b taylor merged in cherry-picked service discovery changes