Merge branch 'master' of git://ted.mutabah.net/acess2

Conflicts:
	Usermode/Libraries/libpsocket.so_src/pton.c

diff --cc Usermode/Libraries/libposix.so_src/unistd.c
Simple merge

diff --cc Usermode/Libraries/libpsocket.so_src/getaddrinfo.c
Simple merge

diff --cc Usermode/Libraries/libpsocket.so_src/pton.c
Simple merge