ecf0769
Merging r143303: ------------------------------------------------------------------------ llvm-svn: 143450