Merge pull request #178 from cuda-geek:fix-2504
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 24 Nov 2012 15:20:53 +0000 (19:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 24 Nov 2012 15:20:53 +0000 (19:20 +0400)

Trivial merge