From: marina.kolpakova <marina.kolpakova@itseez.com>
Date: Mon, 10 Dec 2012 21:12:14 +0000 (+0400)
Subject: Merge branch master into cuda-dev
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~1214^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6c3ed5b36d70808409473ed42be12568f4ed0ee;p=profile%2Fivi%2Fopencv.git

Merge branch master into cuda-dev
---

a6c3ed5b36d70808409473ed42be12568f4ed0ee