Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 30 Dec 2013 15:54:26 +0000 (19:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 30 Dec 2013 15:54:27 +0000 (19:54 +0400)

Trivial merge