Merge branch 'SLE11-SP2' into SLE11-SP3
authorMichal Marek <mmarek@suse.cz>
Mon, 8 Jul 2013 07:30:06 +0000 (09:30 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 8 Jul 2013 07:30:06 +0000 (09:30 +0200)
commit232c4ffdfbd90df755edb9aa1184149b3a064ccb
tree257889aac0cf8ab16b62b40cb0cd02eeb03bcb9f
parentcbaf1ba20f22fdda5ef2f43203fa3f65b4419c07
parent197ac1f8deb650f37cd9cea050240269e1a01ade
Merge branch 'SLE11-SP2' into SLE11-SP3

Conflicts:
series.conf

suse-commit: 28c9b0a1efc68826ed9a7c04879e2a9ca8d782f0