Merge pull request #401 from Daniil-Osokin:bugfix_doc_setNumThreads
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Feb 2013 15:07:40 +0000 (19:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Feb 2013 15:07:41 +0000 (19:07 +0400)

Trivial merge