Merge pull request #303 from taka-no-me:fix_split_merge_test
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 21 Jan 2013 10:14:16 +0000 (14:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 21 Jan 2013 10:14:17 +0000 (14:14 +0400)

Trivial merge