Merge pull request #305 from stephenfalken:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 14:24:36 +0000 (18:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 14:24:36 +0000 (18:24 +0400)

Trivial merge