Fix WFS loading with geoserver layers
fix bug 7167, scale entered by user should work as expected
Merge branch 'master' of http://github.com/amitkulz/Quantum-GIS