Merge pull request #1556 from jet47:fix-bug-3296
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 21 Oct 2013 12:27:59 +0000 (16:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 21 Oct 2013 12:28:00 +0000 (16:28 +0400)

Trivial merge