Merge pull request #1908 from ilya-lavrenov:tapi_imgproc
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 4 Dec 2013 17:41:44 +0000 (21:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Dec 2013 17:41:44 +0000 (21:41 +0400)

Trivial merge