Merge pull request #841 from Pastafarianist:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 12 May 2013 09:00:23 +0000 (13:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 12 May 2013 09:00:23 +0000 (13:00 +0400)

Trivial merge