Merge pull request #1277 from NCBee:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 15:59:12 +0000 (19:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 15:59:12 +0000 (19:59 +0400)

Trivial merge