Wed, 12 Aug 2009 16:23:59 -0600merged greg's recent commits
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:23:59 -0600] rev 378
merged greg's recent commits

Wed, 12 Aug 2009 16:18:57 -0600remove code that i was using for testing.
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:18:57 -0600] rev 377
remove code that i was using for testing.

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

Wed, 12 Aug 2009 15:20:51 -0600fix discovery dialog sorting, remove services from the discovery dialog when they go offline cherry-pick
b.taylor@willowglen.ca [Wed, 12 Aug 2009 15:20:51 -0600] rev 375
fix discovery dialog sorting, remove services from the discovery dialog when they go offline