> To get a merged version of the tree I do this:
>
> cvs -d:ext:swagiaal@sources.redhat.com:/cvs/frysk checkout -j 
> elfutils_0_127 -j elfutils_0_129 frysk
>
> I then resolve all the conflicts by blindly favoring upstream.
>

I have committed the merge to this branch: 
sami-elfutils_129-merge-20070827-branch

check it out like this:

cvs -d:ext:swagiaal@sources.redhat.com:/cvs/frysk checkout -r 
sami-elfutils_129-merge-20070827-branch frysk

attached are the test results from frysk-core