Merging from branch and trunk into local check out branch:

svn merge http://www.openscenegraph.org/svn/osg/OpenSceneGraph/branches/OpenSceneGraph-osgWidget-dev http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .