[gdal/f21: 5/6] Merge branch 'master' into f21

[Volker Fröhlich]

commit 0e13b0ec639f3dadc1d716277ceea26630f17d7c
Merge: 41f3751 0f9a165
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Feb 25 09:21:28 2015 +0100

    Merge branch 'master' into f21

 .gitignore      |  2 ++
 gdal-cleaner.sh |  2 +-
 gdal.spec       | 29 ++++++++++++++++++++++++++---
 sources         |  4 ++--
 4 files changed, 31 insertions(+), 6 deletions(-)
---