Merge pull request #2315 from ilya-lavrenov:nlmeans_perf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 14 Feb 2014 09:24:12 +0000 (13:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Feb 2014 09:24:12 +0000 (13:24 +0400)

Trivial merge