Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
	kernel-source.changes

suse-commit: 92d19729996e7a949b30bbe386d0da3b1cabef33