Modified to reflect changes in branches/atlas-standalone
Modified to reflect changes in branches/atlas-standalone

git-svn-id: cf994790c380884b68018c4cd7b01b4c2e3bb7f4@16156 2913f559-6b04-0410-9a09-c530ee9f5186

gxa/gxa,gxa/gxa,gxa/gxa,gxa/gxa,gxa/gxa