[qgis/f17: 4/4] Merge branch 'master' into f17

[Volker Fröhlich]

commit d520261cfaa198483ec0d224de8cd341a315103a
Merge: 08e119b 6bd551f
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sat Jun 30 14:02:14 2012 +0200

    Merge branch 'master' into f17

 .gitignore                      |    1 +
 qgis-1.7.1-spatialindex.patch   |  257 ---------------------------------------
 qgis-1.8.0-spatialindex17.patch |   12 ++
 qgis.spec                       |  101 ++++++++++------
 sources                         |    2 +-
 5 files changed, 77 insertions(+), 296 deletions(-)
---