Created a new branch for integration etc...
Authored by: wybow 2007-07-04
Parent: [r408]
Child: [r410]