edouard [Thu, 13 Aug 2009 11:48:55 +0200] rev 380
Merge with 35cc4c6a29363d0a89f3e1096832cf14bb79f3de
edouard [Thu, 13 Aug 2009 11:37:38 +0200] rev 379
Merge with 75ae46b66315975b49ec48574befa094be583fdd
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:23:59 -0600] rev 378
merged greg's recent commits
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:18:57 -0600] rev 377
remove code that i was using for testing.
b.taylor@willowglen.ca [Wed, 12 Aug 2009 16:09:00 -0600] rev 376
merged in cherry-picked service discovery changes
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