Merge pull request #3875 from alalek:fix_build
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 26 Mar 2015 13:09:01 +0000 (13:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 26 Mar 2015 13:09:01 +0000 (13:09 +0000)

Trivial merge