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

[Volker Fröhlich]

commit 08e119b3a56b6f40dfcd4c5f91c1bf3b2246cabf
Merge: 23c12fd a301bc5
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Mon Mar 26 22:28:40 2012 +0200

    Merge branch 'master' into f17
    
    Conflicts:
    	qgis.spec

 .gitignore |    1 +
 qgis.spec  |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)
---