[MERGE] Audit and make sure we are registering network_name's as factories, not instances.

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C1236132996.26357.2.camel%40lifeless-64%3E
Project: Bazaar