Merge pull request #3254 from ilya-lavrenov:neon_scale_add
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Oct 2014 14:26:14 +0000 (14:26 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 10 Oct 2014 14:26:14 +0000 (14:26 +0000)

Trivial merge