Import patch ipxfrm-20040707_2.diff

(Logical change 1.53)
11 files changed