Merge pull request #2596 from ilya-lavrenov:tapi_setto
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Apr 2014 14:23:14 +0000 (18:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Apr 2014 14:23:15 +0000 (18:23 +0400)

Trivial merge