Merge pull request #394 from taka-no-me:fix_tiff_test
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 31 Jan 2013 16:52:35 +0000 (20:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 31 Jan 2013 16:52:35 +0000 (20:52 +0400)

Trivial merge