tree f7e5ed02f9ddeb2e2fe3e7f66d15b15120fe0180
parent 9551afd52f54a105629028f2bb8e4ca0f24aed1b
parent 12e2fb0db76ca2705ce5169e04d9cd52762fc685
author Stephen Hines <srhines@google.com> 1345774867 -0700
committer Stephen Hines <srhines@google.com> 1345774867 -0700

Merge branch 'upstream' into merge_2

Conflicts:
	lib/Sema/SemaDeclAttr.cpp

Change-Id: If47d0d39459760017258502b4d9e859ac36a273b