Merge pull request #3220 from asmorkalov:ocv_gstreamer
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:55:49 +0000 (09:55 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:55:49 +0000 (09:55 +0000)

Trivial merge