Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 16 Nov 2012 06:00:13 +0000 (07:00 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 16 Nov 2012 06:00:13 +0000 (07:00 +0100)
commita6da6bb7ce2c243e11e212c2d21d5df5348b66b8
tree19ed0421dc31d176a38d907461833183a82cc0c3
parentc3c2b8df5302d9bf96a8345e40d088a3b4665ff6
parent987429987b4d85d92bf5f5eaf8243d2f9909b1d4
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
rpm/kernel-source.changes.old

suse-commit: fb4580322ae31d6a8063ee04808e804964d155d5