[yast-commit] [yast/yast-packager] 2ca03a: Fixed merging changes