As the svn server is pre 1.5, here is the manual merge tracking.
authorSusanne Oberhauser <froh@suse.de>
Fri, 23 Jan 2009 08:26:39 +0000 (08:26 +0000)
committerSusanne Oberhauser <froh@suse.de>
Fri, 23 Jan 2009 08:26:39 +0000 (08:26 +0000)
commit8556c0f289242a1c86d90188d1dfb73680afc221
tree29162a28848128b1418cb412d665882baac2b02d
parent1de557377fb0e0b2e5fb9569bc97f37605b2690e
As the svn server is pre 1.5, here is the manual merge tracking.
mergeinfo [new file with mode: 0644]