Merge branch 'SLE10-SP2' into SLE10-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 17 Feb 2010 17:07:43 +0000 (18:07 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 17 Feb 2010 17:07:43 +0000 (18:07 +0100)
commite41e61a4327976ad388f3f707b6d4fc05584fd97
treec3e2a30ddcd9f04d00afbdf0e9266fb6da7ddb4d
parent1f5cf06d7eac6d3ff28aec7bc024a35934bba4a1
parenta28b5f876b631f228af80a15dec9a54068839e7c
Merge branch 'SLE10-SP2' into SLE10-SP3

Conflicts:
mkinitrd
mkinitrd
mkinitrd.changes