Merge branch 'master' of git://code.opencv.org/opencv
authorAlexander Smorkalov <alexander.smorkalov@itseez.com>
Tue, 4 Sep 2012 06:50:35 +0000 (10:50 +0400)
committerAlexander Smorkalov <alexander.smorkalov@itseez.com>
Tue, 4 Sep 2012 06:50:35 +0000 (10:50 +0400)
commita08290d843391098d4df88330dcc6c0a44c39417
treee72d11a1e0073c241683b5b0255f37ad046679bc
parent457c8785383c89c766f613d8b581ec00ddd2a4d7
parent8f8a69d6f5f7b9a17f313dcb9d9ef6f3fe56a0be
Merge branch 'master' of git://code.opencv.org/opencv