Please merge branch geoip-update-august2010 in my public repository into maint-0.2.1 and master.