[SCM] qgis branch, debian, updated. final-1_7_1-256-g2a42395

[Francesco Paolo Lovergine]

The following commit has been merged in the debian branch:
commit d5fea8342e4022b17ae7a46ccc8b1d8adbcb43eb
Merge: 110db4e65b525b8d42ba734d844fe289db0d053c c936d031ec77863c5fdef8feec9cacee4ecd143c
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 20 10:32:16 2012 +0100

    Merge branch 'qgis.org-1.7' into debian
    
    Conflicts:
    	src/plugins/grass/modules/r.slope.qgm


-- 
The Quantum GIS in Debian project