Merge branch '1.0' of git+ssh://uclibc-ng.org/git/uclibc-ng into 1.0