merged in lzma patch from mandriva