Merge pull request #455 from AlexeySpizhevoy:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 8 Feb 2013 14:45:24 +0000 (18:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 8 Feb 2013 14:45:24 +0000 (18:45 +0400)

Trivial merge