Merge pull request #2783 from daferna2:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 12 Jun 2014 17:41:28 +0000 (21:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Jun 2014 17:41:28 +0000 (21:41 +0400)
commit45f21e4f12408f9d450729f4b5bd24c68074707b
tree61e3502132d72d04e8fe7fc9a7ead9cb685e0e0c
parent2c134318f7abcbda714f0393d26e95688223df4e
parentb3655233f154fa330ca46dcb90d5193ccbb2c587
Merge pull request #2783 from daferna2:master