Merge pull request #486 from amroamroamro:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Feb 2013 07:21:16 +0000 (11:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Feb 2013 07:21:16 +0000 (11:21 +0400)

Trivial merge