fix conflict
authorKlaus Kämpf <kkaempf@suse.de>
Mon, 15 Feb 2010 16:13:30 +0000 (17:13 +0100)
committerKlaus Kämpf <kkaempf@suse.de>
Mon, 15 Feb 2010 16:13:30 +0000 (17:13 +0100)
commit3a6172b51a8971bacf086206a1a601f623410d3f
tree4db875fa1ae4a32f332af17448da387783d7c257
parentfc16d34ecadf4da7d7d56e92f505978a5ff48a53
parent5960aab8e3ce915dd15ea6e80a898182cc072833
fix conflict