Merge pull request #2207 from ilya-lavrenov:tapi_macro
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 27 Jan 2014 14:56:05 +0000 (18:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 27 Jan 2014 14:56:06 +0000 (18:56 +0400)

Trivial merge