[GeoIP/el6: 4/4] Merge remote-tracking branch 'origin/master' into el6

[Philip Prindeville]

commit e96c0722fa3c2f53ba13e3446be40dfaa57c1cfc
Merge: 6b88784 65ad6a1
Author: Philip A. Prindeville <philipp at redfish-solutions.com>
Date:   Sat Jun 8 08:39:14 2013 -0600

    Merge remote-tracking branch 'origin/master' into el6

 GeoIP.spec |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---