Merging r384, r386 from trunk into clang_3.2 branch.
5 files changed