Merge branch 'master' of code.opencv.org:opencv
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:09:04 +0000 (16:09 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Tue, 7 Aug 2012 12:09:04 +0000 (16:09 +0400)

Trivial merge