[zorp] tproxy patch and Julian's route patch

Hi Bazsi, I am trying to compile a 2.4.31 kernel to support both tproxy for Zorp, and Julian's route patch. However, when I apply both patches, ip_nat_core.c and ip_nat_core.h won't compile. I receive error messages to the effect that the ip_nat_tuple has already been defined, etc. Do you have any suggestions on how to get the two patches to co-exist, and result in a clean compile of netfilter's ip_nat? Thanks in advance. Mark.