Learn more about cloning repositories
You have read-only access
[svn-r23834] merge from trunk up to r23833. Fixed several conflicts, mostly because calling API routines internally was removed from several places in the trunk.
