I think I can't (easily) take only the last commit, since it depends on the previous ones. I think you should have dome something in the line of [this](http://git-scm.com/book/en/Git-Basics-Undoing-Things) in order to undo the changes which are not needed.

In order to make things easier for you, I'm pulling your changes (luckly just a couple of files) and manually merging them into the threading2 branch. Might take some time, but should be easier to do than playing around with git.