Merge branch 'master' of http://llvm.org/git/libcxx
Merge branch 'master' of github.com:efcs/libcxx