Merged in changes from the 0.9.0preview1 tag back to trunk. Please make all changes directly in trunk.

svn merge -r 7108:7129 https://svn.qgis.org/repos/qgis/tags/Preview-0.9.0-1


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7130 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux