Merging files
FactoryParams modifications
LoggingEvent modifications
BoostThreads modifications
DummyThreads modifications
MSThreads modifications
OmniThreads modifications
PThreads modifications