Merge pull request #945 from malcolmreynolds:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Jun 2013 09:32:34 +0000 (13:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Jun 2013 09:32:34 +0000 (13:32 +0400)

Trivial merge