# HG changeset patch
# User b.taylor@willowglen.ca
# Date 1250114940 21600
# Node ID 53b00ff1b2d64b724071e8c5fd9551444f4c1330
# Parent  19db1076e93c1067a7b764066690598f940e4c1d# Parent  b16bcfe531d746b8a6fd8824dc266b5f3318fd09
merged in cherry-picked service discovery changes