Hi,
to be a little bit clearer with the branches I renamed them: master - current stable development, next release will build from it (old 1.0 branch) devel-old - old master experimental branch, will be removed later and new feature branches will be created (old master branch) uclibc - old uclibc master (old upstream branch)
best regards Waldemar