Andrew Bartlett 9b70fa868e Merge from HEAD: ...

- fstring/pstring mixups
 - the detection code that found them (disabled)
 - a bit of whitespace
 - a static

Andrew Bartlett

-

..

parser.c

more bug updates from head

-

partners.c

updated the 3.0 branch from the head branch - ready for alpha18

-

process.c

Merge from HEAD:

-

server.c

patch to include support for daemontools from Michael Handler

-

socket.c

Removed version number from file header.

-

wins_repl.h

Removed version number from file header.

-