Add encoding support to LabelControl.
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge commit 'upstream/master'
Merge commit 'upstream/master'
Merge commit 'upstream/master'
Merge commit 'upstream/master'
merge upstream/master
Merge remote branch 'upstream/master'
Add explicit typename.

Compile fails with GCC 4.3.x & 4.4.x otherwise.
Fix type of operands around '?'.

Compile otherwise fails with:
error: operands to ?: have different types ‘osg::Group*’ and
‘osg::ref_ptr<osg::Group>’
Fix non-const reference.

Compile otherwise fails with:
invalid initialization of non-const reference of type
‘std::_List_const_iterator<osgEarth::Config>&’ from a temporary of type
‘std::_List_const_iterator<osgEarth::Config>’
Remove my old setText routing that took encoding.

Upstream has implemented same via setEncoding.
Merge remote branch 'upstream/master'

Conflicts:
	src/osgEarth/ThreadingUtils
Merge remote branch 'upstream/master'
Merge commit 'upstream/master'
Merge commit 'upstream/master'

Conflicts:
	src/osgEarthUtil/Controls.cpp
Merge commit 'upstream/master'
Merge remote branch 'upstream/master'
Merge commit 'upstream/master'