From: Andrey Kamaev <andrey.kamaev@itseez.com>
Date: Wed, 30 Jan 2013 15:36:09 +0000 (+0400)
Subject: Merge pull request #376 from taka-no-me:solve_tiff_conflict
X-Git-Tag: accepted/2.0/20130307.220821~162
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33c26a93c6d97013b14e7dd080a347e242ef7f37;p=profile%2Fivi%2Fopencv.git

Merge pull request #376 from taka-no-me:solve_tiff_conflict
---

33c26a93c6d97013b14e7dd080a347e242ef7f37