[GeoIP/el6: 18/18] Merge with master/origin.

[Philip Prindeville]

commit dd818b63ec5efb0bfc9788f1afb9ba7824abc5d7
Merge: cc42570 21cdd46
Author: Philip A. Prindeville <philipp at redfish-solutions.com>
Date:   Fri Jun 7 20:10:13 2013 -0600

    Merge with master/origin.

 .gitignore             |    1 +
 GeoIP-1.5.0-UTF8.patch |   69 ++++
 GeoIP.spec             |  172 ++++++++---
 geoip-1.4.6-ipv6.patch |  811 ------------------------------------------------
 geoipupdate.cron       |    4 +
 sources                |    2 +-
 6 files changed, 208 insertions(+), 851 deletions(-)
---