Merge pull request #840 from pablospe:master
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 13 May 2013 17:22:27 +0000 (21:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 13 May 2013 17:22:27 +0000 (21:22 +0400)

Trivial merge