Merge pull request #535 from bitwangyaoyao:2.4_clean
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sun, 24 Feb 2013 11:26:23 +0000 (15:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 24 Feb 2013 11:26:24 +0000 (15:26 +0400)

Trivial merge