Merge pull request #2777 from alexstadnik:master

This commit is contained in:
Roman Donchenko 2014-05-29 14:43:30 +04:00 committed by OpenCV Buildbot
commit a8608bd0ac

File diff suppressed because it is too large Load Diff