From: Ernest Galbrun <ernest.galbrun@univ-lorraine.fr>
Date: Thu, 31 Jul 2014 14:03:51 +0000 (+0200)
Subject: Merge branch 'master' into cuda_concurrency
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~164^2~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae26368e78e94125ab8bf4bc25663b63d345833d;p=profile%2Fivi%2Fopencv.git

Merge branch 'master' into cuda_concurrency
---

ae26368e78e94125ab8bf4bc25663b63d345833d