Merge pull request #1077 from bitwangyaoyao:2.4_kmeans
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 10 Jul 2013 14:32:13 +0000 (18:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 10 Jul 2013 14:32:14 +0000 (18:32 +0400)

Trivial merge