Merge branch 'maint-0.2.2'

changes/geoip-may2011

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the May 1 2011 Maxmind GeoLite Country database.
+

doc/HACKING

@@ -435,6 +435,8 @@ interesting and understandable.
 
    Make stuff very terse
 
+   Make sure each section name ends with a colon
+
    Describe the user-visible problem right away
 
    Mention relevant config options by name.  If they're rare or unusual,