Merging changes from trunk.

llvm-svn: 186841
7 files changed
tree: 748370c81572ffddf2f68c11d77be8db70c8d09a
  1. vmkit/