Merge pull request #845 from githubuser0xFFFF:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 12 May 2013 08:54:44 +0000 (12:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 12 May 2013 08:54:44 +0000 (12:54 +0400)

Trivial merge