[qgis/f14: 2/2] Merge branch 'master' into f14

[Volker Fröhlich]

commit 66ef86b813353f9799e38dba51c2b6126bbbd5dc
Merge: c5b16e7 ee595cf
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sun Jul 24 15:09:53 2011 +0200

    Merge branch 'master' into f14

 qgis-1.7.0-histogram.patch |   12 ++++++++++++
 qgis.spec                  |    6 +++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---