From: Alexandre Benoit <benoit.alexandre.vision@gmail.com>
Date: Fri, 31 Aug 2012 09:20:13 +0000 (+0200)
Subject: Merge branch 'master' of git://code.opencv.org/opencv
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~4327^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2907eec670f1b23ffcb33dbeedfa23c91a28c301;p=platform%2Fupstream%2Fopencv.git

Merge branch 'master' of git://code.opencv.org/opencv
---

2907eec670f1b23ffcb33dbeedfa23c91a28c301