Merge pull request #224 from wswld:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 15 Dec 2012 12:06:32 +0000 (16:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 15 Dec 2012 12:06:32 +0000 (16:06 +0400)

Trivial merge