Push fixes from branch back to trunk

Notes

• we use version 4.0.1 as an example release version here, so branch 4.0 is used
• You should have trunk checked out under ~/toolkit directory
• You should have 4.0 branch checked out under ~/toolkit directory

Go to branch directory

# go to proper directory
cd ~/toolkit/trunk
# diff changes first, inspect them
svn diff -r 753:766 ../4.0
# merge changes
svn merge -r 753:766 ../4.0
# commit changes back to trunk
svn commit -m "ported fixes r754-r766 from VERSION"