[Feature: Add more color options. Provided by olivierdalang]. Modifications for xml reading / writing
Merge branch 'master' of github.com:qgis/Quantum-GIS