Merge pull request #1216 from alekcac:sphinx
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 6 Aug 2013 10:31:14 +0000 (14:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 Aug 2013 10:31:15 +0000 (14:31 +0400)

Trivial merge