Merge pull request #654 from fish2000:patch-1
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 18 Mar 2013 11:56:54 +0000 (15:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Mar 2013 11:56:55 +0000 (15:56 +0400)

Trivial merge