Merge branch 'ebt_config_compat_v4' of git://git.breakpoint.cc/fw/nf-next-2.6
authorPatrick McHardy <kaber@trash.net>
Thu, 18 Feb 2010 10:41:39 +0000 (11:41 +0100)
committerPatrick McHardy <kaber@trash.net>
Thu, 18 Feb 2010 10:41:39 +0000 (11:41 +0100)

Trivial merge