release fix for conflict
Merge branch 'master' of github.com:yast/yast-ldap into fix_conflicts

Conflicts:
	package/yast2-ldap.changes
Merge pull request #9 from yast/fix_conflicts

release fix for conflict