tree 3c389272682c6960ecba058b4757a8db6fb5f972
parent 9e8bf2cb9ee4846aa1aaf0a24224d48910fcb621
parent abc0bea57d4e659d5cde178a4bb426acc48f999e
author Stephen Hines <srhines@google.com> 1363653040 -0700
committer Stephen Hines <srhines@google.com> 1363653040 -0700

Merge branch 'upstream' into merge_2013_03_18

Conflicts:
	lib/Sema/SemaDeclAttr.cpp

Change-Id: I05e70941163ec5a461eba43ef78f6738cd5a1e69