Merge pull request #252 from taka-no-me:fix_stlport_build
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 08:44:12 +0000 (12:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Dec 2012 08:44:13 +0000 (12:44 +0400)

Trivial merge