Merge pull request #2578 from akrynski:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 15 Apr 2014 09:21:08 +0000 (13:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 15 Apr 2014 09:21:08 +0000 (13:21 +0400)

Trivial merge