Merge pull request #518 from asmorkalov:ts_refactor
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Feb 2013 12:34:14 +0000 (16:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Feb 2013 12:34:14 +0000 (16:34 +0400)

Trivial merge