Merge pull request #2752 from jet47:pr-2746

This commit is contained in:
Vadim Pisarevsky 2014-05-19 17:30:32 +04:00 committed by OpenCV Buildbot
commit f01bd6f978

File diff suppressed because it is too large Load Diff