[gdal/f15: 8/8] Merge branch 'master' into f15

[Volker Fröhlich]

commit a9f9233a32443c5b2d226180ff069059b7b9b62a
Merge: 0761dbf 68aad6a
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Jan 15 18:58:09 2012 +0100

    Merge branch 'master' into f15

 gdal-1.7.3-png15.patch |   39 +++++++++
 gdal-1.7.3.pom         |    2 +-
 gdal-libdap.patch      |   24 ------
 gdal.spec              |  207 ++++++++++++++++++++++++++++--------------------
 sources                |    2 +-
 5 files changed, 163 insertions(+), 111 deletions(-)
---