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