Merge branch 'io' into unstable

diff --cc config.h
Simple merge

diff --cc include/unistd.h
index 211d3d76f0bdbab348c051a38db0d89241ddcd44,09e2937f9d3f8d108f59379f6148bb3aca973646..900600e465ff21981fe8495b00c6eee9d24e2a82
--- 1/include/unistd.h
--- 2/include/unistd.h
+++ b/include/unistd.h
@@@ -10,5 -10,9 +10,7 @@@ extern pid_t vfork(void)
  extern int execfve(void*, const char**, const char**);
  extern int execeve(void*, size_t, char *const [], char *const []);
  extern unsigned int sleep(unsigned int);
 -extern int brk(void*);
 -extern void* sbrk(int);
  
+ extern int pipe(int pipefd[2]);
+ 
  #endif /* _UNISTD_H */

diff --cc kernel/klibc/Makefile
index ec3635be910f2f8a5b94e9b990fdd09ed6438560,ff21f074dede149f5c0916ed07a6772de5c1b0d2..b86fc4a67ae47e1b4d7fa1c28e9f14a0e7a221ea
--- 1/kernel/klibc/Makefile
--- 2/kernel/klibc/Makefile
+++ b/kernel/klibc/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  OUTPUT = klibc.a
- OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o stdio.o signal.o \
-           kq.o sem.o
 -OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o heap.o stdio.o signal.o \
 -          kq.o sem.o string_ia32.o
++OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o stdio.o signal.o kq.o sem.o \
++        string_ia32.o
  PHONY = clean
  INCLUDES = -I../include -I../../include -I../..
  CFLAGS = -m32 -Wall -nostdlib -nodefaultlibs -nostartfiles -ffreestanding $(INCLUDES)