Merge pull request #1489 from melody-rain:2_4_knearest_neighbor
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Mon, 23 Sep 2013 09:34:38 +0000 (13:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 23 Sep 2013 09:34:39 +0000 (13:34 +0400)

Trivial merge