Merge pull request #2126 from yinghau76:master
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 10:00:52 +0000 (14:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 9 Jan 2014 10:00:53 +0000 (14:00 +0400)
commitb45bb60c8bcae37edb2251b4caccdeb178b3e8e3
treef10ad04957b3ce2acab12fbddcc4278e1484de81
parentcab67cd9ac7b0680d49d1b26c08c779b3118a9f6
parentb24f7ee57c16f9748809ae20583178177b9c1bf6
Merge pull request #2126 from yinghau76:master