Merge pull request #3369 from vbystricky:fix_scaleAdd
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 27 Oct 2014 10:03:29 +0000 (10:03 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 27 Oct 2014 10:03:29 +0000 (10:03 +0000)

Trivial merge