Merge upstream to r135343 at Sat. 16th July 2011.

author Nowar Gu <nowar100@gmail.com>

Sat, 16 Jul 2011 12:12:42 +0000 (20:12 +0800)

committer Nowar Gu <nowar100@gmail.com>

Sat, 16 Jul 2011 12:58:03 +0000 (20:58 +0800)
author Nowar Gu <nowar100@gmail.com>
Sat, 16 Jul 2011 12:12:42 +0000 (20:12 +0800)
committer Nowar Gu <nowar100@gmail.com>
Sat, 16 Jul 2011 12:58:03 +0000 (20:58 +0800)
diff --cc include/llvm/Bitcode/LLVMBitCodes.h
Simple merge
diff --cc lib/Bitcode/Reader/BitcodeReader.cpp
Simple merge
diff --cc lib/Bitcode/Reader/BitcodeReader.h
Simple merge
diff --cc lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
Simple merge
author	Nowar Gu <nowar100@gmail.com>
	Sat, 16 Jul 2011 12:12:42 +0000 (20:12 +0800)
committer	Nowar Gu <nowar100@gmail.com>
	Sat, 16 Jul 2011 12:58:03 +0000 (20:58 +0800)
		1	2
include/llvm/Bitcode/LLVMBitCodes.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Bitcode/Reader/BitcodeReader.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Bitcode/Reader/BitcodeReader.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history