Merge pull request #189 from wswld:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 27 Nov 2012 13:48:54 +0000 (17:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 27 Nov 2012 13:48:55 +0000 (17:48 +0400)

Trivial merge