Merge branch 'master' of http://github.com/kmalloc/back-end-facility

Conflicts:
	net/SocketServer.cc