Merge branch 'SLE10-SP2' into SLE10-SP3
authorMichal Marek <mmarek@suse.cz>
Wed, 3 Mar 2010 21:56:29 +0000 (22:56 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 3 Mar 2010 21:56:29 +0000 (22:56 +0100)
commita12338d0ef9106cd1092989cc0221228c3963653
tree11e4179ef301cebd5cc4ade33ab49b9abc99d203
parente41e61a4327976ad388f3f707b6d4fc05584fd97
parent8c4dd5e1560553616962820aa38ec6e19fbb7d0d
Merge branch 'SLE10-SP2' into SLE10-SP3

Conflicts:
mkinitrd
mkinitrd
mkinitrd.changes