Merge pull request #345 from Daniil-Osokin:bugfix_2550
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 28 Jan 2013 19:56:26 +0000 (23:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Jan 2013 19:56:26 +0000 (23:56 +0400)

Trivial merge