Merge pull request #861 from albenoit:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 12 May 2013 08:53:14 +0000 (12:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 12 May 2013 08:53:14 +0000 (12:53 +0400)
commitf1e8f69d2c3db610883bd412ce712fb7c7d07ee6
treee6ba2206c6395cfeb9316f70bb4e2b355f7e8607
parent7f083a049d367e221135ed6ce958d30e047bd695
parenta5acc9ee1f0a9fe9d946be91d0f67db05c0911e4
Merge pull request #861 from albenoit:master