From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Mon, 30 Dec 2013 12:51:46 +0000 (+0400)
Subject: Merge commit '0566ab4d3d' into merge-2.4
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~748^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1312eca220430cfbc9d6f1aa7f0e472fc5b84974;p=profile%2Fivi%2Fopencv.git

Merge commit '0566ab4d3d' into merge-2.4

Conflicts:
	modules/core/src/system.cpp
---

1312eca220430cfbc9d6f1aa7f0e472fc5b84974