Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread header...