Merge branch 'master' into SLE11-SP1

suse-commit: 6fa961a804730bf831a627deb2b7c2c7dd054ac0