Make the merged code work again. Also fixs a SEGV.
tree5d6d1271e6dbdfa5e23d019774150822a865d251
-rw-r--r-- 35147 COPYING
drwxr-xr-x - incoming
-rwxr-xr-x 1150 mktar.pl
drwxr-xr-x - patches
drwxr-xr-x - src