Merge pull request #4014 from sgjava:opencv-sgjava
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 14 May 2015 18:23:27 +0000 (18:23 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 14 May 2015 18:23:28 +0000 (18:23 +0000)

Trivial merge