Merge pull request #3637 from wangyan42164:LBP_mad24_opt
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 28 Jan 2015 18:51:52 +0000 (18:51 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 28 Jan 2015 18:51:52 +0000 (18:51 +0000)

Trivial merge