Merge pull request #2589 from alalek:icv_update
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Apr 2014 14:23:34 +0000 (18:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Apr 2014 14:23:35 +0000 (18:23 +0400)

Trivial merge