Merge branch 'master' of git://code.opencv.org/opencv
authorAlexandre Benoit <benoit.alexandre.vision@gmail.com>
Fri, 31 Aug 2012 09:20:13 +0000 (11:20 +0200)
committerAlexandre Benoit <benoit.alexandre.vision@gmail.com>
Fri, 31 Aug 2012 09:20:13 +0000 (11:20 +0200)
commit2907eec670f1b23ffcb33dbeedfa23c91a28c301
tree4206700c137ccf15e6e31c7e0301a812cf148001
parentffb3842ef1f5e47ddada178922bf8f04e899f421
parent6f6e990988eb2cf41b05c9e89b435dec781df3d6
Merge branch 'master' of git://code.opencv.org/opencv