Merge with clang upstream r127869 (Mar 18th 2011)