Merge pull request #225 from pieleric:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 16 Dec 2012 18:18:23 +0000 (22:18 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 16 Dec 2012 18:18:24 +0000 (22:18 +0400)

Trivial merge