CMSSW_6_2_X_2013-05-17-1400
CMSSW_6_2_X_2013-05-19-0200
Merge branch 'CMSSW_6_2_X' of https://github.com/cms-sw/cmssw-ib into oneProducerImpl on 2013/05/20

Conflicts:
	FWCore/Framework/interface/moduleAbilities.h
	FWCore/Framework/interface/moduleAbilityEnums.h
	FWCore/Framework/interface/one/EDFilter.h
	FWCore/Framework/interface/one/EDFilterBase.h
	FWCore/Framework/interface/one/EDProducer.h
	FWCore/Framework/interface/one/EDProducerBase.h
	FWCore/Framework/interface/one/filterAbilityToImplementor.h
	FWCore/Framework/interface/one/implementors.h
	FWCore/Framework/interface/one/moduleAbilities.h
	FWCore/Framework/interface/one/producerAbilityToImplementor.h
	FWCore/Framework/src/one/EDFilterBase.cc
	FWCore/Framework/src/one/EDProducerBase.cc
	FWCore/Framework/src/one/SharedResourcesUser.cc
	FWCore/Framework/src/one/filterImplementors.cc
	FWCore/Framework/src/one/implementorsMethods.h
	FWCore/Framework/src/one/producerImplementors.cc