Merge pull request #1870 from es0m:es0m-2.4-imgproc-samplers
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:47:39 +0000 (15:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:47:39 +0000 (15:47 +0400)

Trivial merge