wip
Merge branch 'master' of https://github.com/leadcoder/osgVegetation

Conflicts:
	samples/sample2/sample2.cpp