Merge pull request #4 from gem-sw/CMSSW_6_2_X_SLHC

Merge
GEM in GlobalTrackingGeometryTest
Merge pull request #35 from dildick/CMSSW_6_2_X_SLHC

GEM in GlobalTrackingGeometryTest