Merge pull request #2964 from vbystricky:highgui_split
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 16 Jul 2014 19:29:36 +0000 (19:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 16 Jul 2014 19:29:36 +0000 (19:29 +0000)

Trivial merge