Merge branch 'master' of git://github.com/llvm-mirror/clang into epiphany