Merge branch 'master' of git://github.com/llvm-mirror/clang
Merge branch 'master' into offsetof-field