Merge pull request #228 from Nerei:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 16 Dec 2012 18:15:07 +0000 (22:15 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 16 Dec 2012 18:15:07 +0000 (22:15 +0400)

Trivial merge