Wed, 12 Aug 2009 16:09:00 -0600 b taylor merged in cherry-picked service discovery changes
Wed, 12 Aug 2009 15:20:51 -0600 b taylor fix discovery dialog sorting, remove services from the discovery dialog when they go offline cherry-pick