Merge branch 'master' of git://code.opencv.org/opencv
authornoob <noob@noob.(none)>
Wed, 29 Aug 2012 16:14:07 +0000 (18:14 +0200)
committernoob <noob@noob.(none)>
Wed, 29 Aug 2012 16:14:07 +0000 (18:14 +0200)
commitfba081992d0d6da5f546e4434c1aabaf1db80d03
treef9272b9ceddd249f6b52d9ff2c8c0cc685f9919a
parent424bc609b6f352a2b10f2a01ffcd037483e3591f
parent0ba01afd83d16d8ba2cfbf98dd46debe569b69cd
Merge branch 'master' of git://code.opencv.org/opencv