$ svn merge -c 99670 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r99670 into '.':
U    gcc/llvm-convert.cpp

llvm-svn: 99675