[yast-commit] [yast/yast-installation] a4caad: Fixed merge