fixes issue with merging "set" variables in different configs
fixes issue with merging "set" variables in different configs

git-svn-id: 218d9835f48105c2b211e16e763afd6f0acdb2e8@15564 0f35748b-8228-47f0-bbea-889afbbd9a42

zicht/z,zicht/z