Merge branch 'geoip'

diff --cc doc/changelog.txt
index 049c11d05e32c26536ab72cd229a6b2de391cc7e,5d31f9c1f5cf7f1c9abe0b4625eee51d9c3637a9..2a58ba6cf82915784bfd034e40ae94336e0c1f32
--- 1/doc/changelog.txt
--- 2/doc/changelog.txt
+++ b/doc/changelog.txt
@@@ -2,27 -2,10 +2,28 @@@
  HEAD
  ====
  Fixes:
 -- Update to ipset 4.5
 -  * the iptreemap type used wrong gfp flags when deleting entries
 +- build: restore functionality of `configure --without-kbuild`
 +- build: fix objdir builds for ipset-5 (xt-a specific)
 +- xt_LOGMARK: fix detection of untracked connection for Linux >= 2.6.36
  Enhancements:
+ - IPv6 support for xt_geoip
 +- Update to ipset 5.3
 +  * make IPv4 and IPv6 address handling similar
 +  * show correct line numbers in restore output for parser errors
 +- Update to ipset 5.4
 +  * fixed ICMP and ICMPv6 handling
 +  * fixed trailing whitespaces and pr_* messages
 +  * fixed module loading at create/header commands
 +
 +
 +v1.32 (2011-01-04)
 +==================
 +Fixes:
 +- Update to ipset 4.5
 +  * the iptreemap type used wrong gfp flags when deleting entries
 +- Include ipset 5.2 with genetlink patch (beta)
 +  * no kernel patch needed, but requires Linux >= 2.6.35
 +    and thus needs to be manually enabled in mconfig
  
  
  v1.31 (2010-11-05)