Merge pull request #330 from sromberg:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 10:26:54 +0000 (14:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 10:26:54 +0000 (14:26 +0400)

Trivial merge