Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Feb 2013 12:35:17 +0000 (16:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Feb 2013 12:35:18 +0000 (16:35 +0400)

Trivial merge