Merge pull request #904 from ograycode:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 22 May 2013 14:46:39 +0000 (18:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 22 May 2013 14:46:40 +0000 (18:46 +0400)

Trivial merge