Merge pull request #3253 from asmorkalov:ocv_gstreamer2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 23 Sep 2014 11:51:24 +0000 (11:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 23 Sep 2014 11:51:25 +0000 (11:51 +0000)

Trivial merge