From: Tony <exocoder@gmail.com>
Date: Sun, 6 Apr 2014 10:49:23 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~369^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=572e4f52556cc833df3a98126acbc8c346db3bd5;p=profile%2Fivi%2Fopencv.git

Merge remote-tracking branch 'upstream/master'
---

572e4f52556cc833df3a98126acbc8c346db3bd5