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