#9062 (FIX): Unmerge, already fixed in master

http://hub.qgis.org/projects/quantum-gis/repository/revisions/af73f30c27b5ee4860842d79eb59ad3b584e0965