Learn more about cloning repositories
You have read-only access
[svn-r20463] Merge with trunk (had to manually resolve conflict in a CMake configuration file).
