Merge pull request #2289 from ilya-lavrenov:umat_expr
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 6 Feb 2014 17:37:57 +0000 (21:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 6 Feb 2014 17:37:57 +0000 (21:37 +0400)

Trivial merge