Merge branch 'master' into SLE11-SP1

suse-commit: e55dc2b73dc1e1eabb3de0744f77fd728ec520a3