Merge pull request #247 from wswld:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 24 Dec 2012 17:02:04 +0000 (21:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Dec 2012 17:02:04 +0000 (21:02 +0400)

Trivial merge