Merge pull request #2215 from asmorkalov:ocv_testpack_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 28 Jan 2014 13:51:06 +0000 (17:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 28 Jan 2014 13:51:07 +0000 (17:51 +0400)

Trivial merge