Merge r51243.

svn path=/branches/cmake-bringup/; revision=51244
This commit is contained in:
Sylvain Petreolle
2011-04-03 20:36:28 +00:00