- Sync with trunk r51050. svn path=/branches/cmake-bringup/; revision=51154
svn path=/branches/cmake-bringup/; revision=48236