Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Nov 2012 07:43:18 +0000 (11:43 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 21 Nov 2012 07:43:18 +0000 (11:43 +0400)

Trivial merge