Merge with Clang upstream r160673 (Jul 24th 2012)

Conflicts:
	lib/Sema/SemaDeclAttr.cpp

Change-Id: I37f02f20642a037b9da8d35fefa01986cd250b14