llvm: conflict with git variant
Merge pull request #490 from RealJohnGalt/topic-git3

llvm: conflict with git variant