Merge ../master into SLE11-SP1

suse-commit: f72434a5be5ad706eb048391da85574f13394436