Merge pull request #334 from asmaloney:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 20:45:34 +0000 (00:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 20:45:34 +0000 (00:45 +0400)

Trivial merge