Reformat done with clang-3.5 svn200967

Reformat done with clang-3.5 svn200967