Improved the reliability of bonjour registration and discovery

Ignore-this: 49f8996bc66c9859c885439cdb4c49cc

darcs-hash:20100406151705-1e3d8-0a8c9af54f608fb4016001259600865587f16ac3