Tagging 2324.3 on the Hermes branch.

llvm-svn: 96257
$ svn merge -c 95958 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r95958 into '.':
U    gcc/llvm-convert.cpp
$ svn merge -c 95961 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r95961 into '.':
G    gcc/llvm-convert.cpp

llvm-svn: 95978
1 file changed
tree: dd734f598695390d5bcf4c168fbf1612efb36460
  1. llvm-gcc-4.2/