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