merge netfilter changes to 2.6.27