[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Tim Sutton]

The following commit has been merged in the master branch:
commit fd7e03d7b3881b8a8e7eb4515b317b2be2d24301
Merge: 32be114f7606556b83b7c4a2b69b230baf0ab3fa ad955e26bf9fe7281c286c18b3b41fde6846b3bd
Author: Tim Sutton <tim at linfiniti.com>
Date:   Fri Mar 2 02:57:37 2012 +0200

    Merge branch 'master' of github.com:qgis/Quantum-GIS


-- 
The Quantum GIS in Debian project