Merge pull request #2592 from ilya-lavrenov:tests
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Apr 2014 10:06:13 +0000 (14:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Apr 2014 10:06:14 +0000 (14:06 +0400)

Trivial merge