Auto merge with /home/aegl/GIT/linus
[linux-2.6] / include / linux / netfilter_ipv4 / ip_conntrack_ftp.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2