Merge branch 'SLE10-SP2' into SLE10-SP3
authorMichal Marek <mmarek@suse.cz>
Fri, 12 Mar 2010 11:45:05 +0000 (12:45 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 12 Mar 2010 11:45:05 +0000 (12:45 +0100)
commit1f3ce08a34f77d41227a5832f3c6a93063e92f5b
treea4a744f46cebb8a62f4a0756305a3a7ff377920d
parent1ba39e49486817286bf3f80ce37becdb7ac8014a
parent96e67611e5e078cea763aadad53b013cb1683304
Merge branch 'SLE10-SP2' into SLE10-SP3

Conflicts:
mkinitrd