Merge pull request #3400 from vpisarev:fixed_umat_test_crash
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 7 Nov 2014 12:50:26 +0000 (12:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 7 Nov 2014 12:50:26 +0000 (12:50 +0000)

Trivial merge