[php-pecl-geoip/el6: 8/8] Merge branch 'master' into el6

[topdog]

commit a475465f6730d936773821232995b29ecdcba0e9
Merge: a463375 9f601a6
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sun Oct 28 10:10:37 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore          |    2 +-
 php-pecl-geoip.spec |   47 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 18 deletions(-)
---