Merge branch 'injector_progressbar'
Merge branch 'readme_merge'
Merge branch 'injector_progressbar'
Merged llvm-3.3-development with upstream changes.
Merge remote-tracking branch 'shaden/llvm-3.3'