Merge branch 'master' of code.opencv.org:opencv
authorDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:17:44 +0000 (12:17 +0400)
committerDaniil Osokin <daniil.osokin@itseez.com>
Tue, 14 Aug 2012 08:17:44 +0000 (12:17 +0400)

Trivial merge