Merge pull request #4006 from sgjava:opencv-steve
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:36:15 +0000 (11:36 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 May 2015 11:36:15 +0000 (11:36 +0000)

Trivial merge