Merge branch 'master' into SLE11-SP1
authorMichal Marek <mmarek@suse.cz>
Mon, 25 Jan 2010 16:19:14 +0000 (17:19 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 25 Jan 2010 16:19:14 +0000 (17:19 +0100)
commit3970cc1548c01d1aa03eabd426f0a656a45cfc40
tree3e725b157db6d83823be303365b8a7451dfda9b7
parent0feb5800d4569f830b291d23f5c7e919e3a1e79a
parent90d02c311874cbccc9e28e1df4e90c17a54b21f8
Merge branch 'master' into SLE11-SP1

suse-commit: df7ee09e720058110e3a5d882a99153e3a705365