Thu, 13 Aug 2009 11:37:38 +0200 edouard Merge with 75ae46b66315975b49ec48574befa094be583fdd
Wed, 12 Aug 2009 16:23:59 -0600 b taylor merged greg's recent commits
Wed, 12 Aug 2009 16:18:57 -0600 b taylor remove code that i was using for testing.
Wed, 12 Aug 2009 16:09:00 -0600 b taylor merged in cherry-picked service discovery changes