Merge branch 'master' of git://github.com/vpas/opencv into nonlocal_means
authorLeonid Beynenson <Leonid.Beynenson@itseez.com>
Tue, 21 Aug 2012 12:07:18 +0000 (16:07 +0400)
committerLeonid Beynenson <Leonid.Beynenson@itseez.com>
Tue, 21 Aug 2012 12:07:18 +0000 (16:07 +0400)

Trivial merge