merge netfilter kernel changes to 2.6.26 as well