Merge pull request #1231 from SpecLad:static-ts
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 6 Aug 2013 16:53:43 +0000 (20:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 Aug 2013 16:53:43 +0000 (20:53 +0400)

Trivial merge