K 10
svn:author
V 3
dim
K 8
svn:date
V 27
2014-03-10T21:58:38.673224Z
K 7
svn:log
V 172
Repair a few minor mismerges from r262261 in the clang-sparc64 project
branch.  This is also to minimize differences with upstream.

MFC after:	3 weeks
X-MFC-With:	r262613

END