[geos/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 705e2808724f9e5faa30016442903462ddf4a4c5
Merge: 87b6e62 ff338a3
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Feb 27 17:07:45 2012 +0100

    Merge branch 'master' into f17

 geos-3.2.0-ARM.patch     |   13 -------
 geos-3.3.2-php-5.4.patch |   89 ++++++++++++++++++++++++++++++++++++++++++++++
 geos-3.3.2-ruby-19.patch |   13 +++++++
 geos.spec                |   27 ++++++++++----
 4 files changed, 122 insertions(+), 20 deletions(-)
---