Merge pull request #940 from SpecLad:autolock
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Jun 2013 13:50:31 +0000 (17:50 +0400)

Trivial merge