correct bug in labelling for fields containing non-alpha characters
Merge branch 'labeling_expression' of github.com:leyan/Quantum-GIS into labeling_expression

Conflicts:
	src/app/qgslabelinggui.cpp