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

Conflicts:
	python/console/console_editor.py
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorfilewriter.cpp
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db
Merge branch 'styles_to_db' of https://github.com/el1073/Quantum-GIS into styles_to_db

Conflicts:
	src/core/qgsvectordataprovider.h