diff --git a/AUTHORS.txt b/AUTHORS.txt
index 32ce11971..91a5f4944 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -1,6 +1,6 @@
 OpenSceneGraph Library 2.6.0
 
-323 Contributors:
+324 Contributors:
 
 Firstname Surname
 -----------------
@@ -21,8 +21,8 @@ Ulrich Hertlein
 Martin Lavery
 David Callu
 Tree 
-Luigi Calori
 Jean-Sebastien Guay
+Luigi Calori
 Trajce Nikolov
 Mike Wittman
 Pavel Moloshtan
@@ -42,17 +42,17 @@ Olaf Flebbe
 Gideon May
 Don Tidrow
 Romano José Magacho da Silva
+Philip Lowman
 Paul Melis
 Michael Platings
 Michael Gronager
 Daniel Sjölie
 Chris Hanson
 Adrian Egli
+Sherman Wilcox
 Per Fahlberg
 J.P. Delport
 David Spilling
-Sherman Wilcox
-Philip Lowman
 Melchior Franz
 Joran Jessurun
 Joakim Simonsson
@@ -69,6 +69,7 @@ Rune Schmidt Jensen
 Rainer Oder
 Mike Connell
 Mathieu Marache
+Glenn Waldron
 Carlo Camporesi
 Ben Discoe
 Andreas Ekstrand
@@ -97,7 +98,6 @@ Mihai Radu
 Michael Hartman
 Luc Frauciel
 Laurens Voerman
-Glenn Waldron
 David Guthrie
 Corbin Holtz
 Cedric Pinson
@@ -298,6 +298,7 @@ Dean Iverson
 David Jung
 David Gurhrie
 Daniel Stien
+Daniel Olivier
 Dan Minor
 Cyril Brulebois
 Clay Fowler
diff --git a/ChangeLog b/ChangeLog
index 4c1286b2a..e63b13285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2008-08-05 10:31 +0000 [r8733]  robert:
+
+	* Updated wrappers
+
+2008-08-05 10:23 +0000 [r8732]  robert:
+
+	* Updated SO version number to reflect typo fixes changing the API
+
+2008-08-05 10:20 +0000 [r8731]  robert:
+
+	* Added support for both the old autoScaleTransistionWidthRatio
+	  (note typo) and newly fixed autoScaleTransitionWidthRatio in the
+	  .osg parsing
+
+2008-08-05 09:58 +0000 [r8730]  paulmelis:
+
+	* - Fixes for two spelling mistakes
+
+2008-08-04 20:50 +0000 [r8729]  robert:
+
+	* Added -losgWidget to lib list, change merged in from svn trunk,
+	  using : svn merge -r 8727:8728
+	  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .
+
+2008-08-04 17:10 +0000 [r8727]  robert:
+
+	* From Sherman Wilcox, "Minor change to bool
+	  setGLExtensionFuncPtr(T& t, const char* str1) and
+	  setGLExtensionFuncPtr(T& t, const char* str1, const char* str2) -
+	  functions returned false even on success." Note, merged from
+	  svn/trunk using: svn merge -r 8725:8726
+	  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .
+
+2008-08-04 15:30 +0000 [r8724]  robert:
+
+	* Updated ChangeLog for 2.6.0-rc2
+
+2008-08-04 15:21 +0000 [r8723]  robert:
+
+	* Updated NEWS and AUTHORS for 2.6.0-rc2 from osg trunk, using "svn
+	  merge -r 8719:8722
+	  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk ."
+
 2008-08-04 14:04 +0000 [r8719]  robert:
 
 	* merged Philip Pulman's Centos 5 compile fix from trunk using :
diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp
index bc41703ec..204cd85f4 100644
--- a/applications/osgversion/osgversion.cpp
+++ b/applications/osgversion/osgversion.cpp
@@ -219,6 +219,8 @@ bool validName(const std::string& first)
     if (first=="LightPointNode") return false;
     if (first=="GeometryTechnique") return false;
     if (first=="GeoemtryTechnique") return false;
+    if (first=="KdTree") return false;
+    if (first=="LineSegment") return false;
     return true;
 }