[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

[Tim Sutton]

The following commit has been merged in the master branch:
commit 32be114f7606556b83b7c4a2b69b230baf0ab3fa
Merge: 643db0e328566e95a90035cc92d9a5f6c287d77c 8459b5834f9100f3adf9375f04cbe3428a186c8b
Author: Tim Sutton <tim at linfiniti.com>
Date:   Thu Mar 1 12:08:54 2012 +0200

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


-- 
The Quantum GIS in Debian project