Merge pull request #2550 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Apr 2014 08:00:00 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Apr 2014 08:00:01 +0000 (12:00 +0400)
commitc165f0731994dbbffa6f060f538a5242e3c15401
treed86f998e3e154bc254c52386048d9985c9f4b632
parent6ef94b52add4090773e8396cb4095ef3742ed5f0
parentf77c68e0fa1fc7d62bf66d795dd0f7621a674b31
Merge pull request #2550 from SpecLad:merge-2.4