Merge with klibc.git