Itseez/opencv — pull request #2641 by SpecLad (2014-04-21 13:27:29+00:00)
Title: Merge 2.4 into master

Original pull requests:

* #2016 from pemmanuelviel:kmeansppSquareDist
* #2544 from alalek:perf_report_regressions

Wow, we're having a drought here.