Merge pull request #3247 from a-wi:CMake_MSMF_configuration
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Sep 2014 15:31:09 +0000 (15:31 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Sep 2014 15:31:09 +0000 (15:31 +0000)

Trivial merge