Merge pull request #405 from vpisarev:znah_patch
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Feb 2013 12:06:54 +0000 (16:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Feb 2013 12:06:54 +0000 (16:06 +0400)

Trivial merge