Merge remote-tracking branch 'karsten/geoip-march2012' into maint-0.2.2