Merge pull request #2779 from pemmanuelviel:kmeansppSquareDist
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:35:27 +0000 (21:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:35:28 +0000 (21:35 +0400)

Trivial merge