Merge pull request #343 from taka-no-me:fix_nlmeans_2646
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 16:35:39 +0000 (20:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Jan 2013 16:35:39 +0000 (20:35 +0400)

Trivial merge