tree 762bdf5805dbae771e7cfd9958da103b1bdea53f
parent 3b5c316aaca67e942eeb6a81353dbdbae060378d
parent 9f17408d50c1d76c5eab435e4ceb924cc10757ab
author Shih-wei Liao <sliao@google.com> 1343980783 -0700
committer Shih-wei Liao <sliao@google.com> 1343980783 -0700

Merge with Clang upstream r160673 (Jul 24th 2012)

Conflicts:
	lib/Sema/SemaDeclAttr.cpp

Change-Id: I37f02f20642a037b9da8d35fefa01986cd250b14