From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 4 Jul 2013 05:18:11 +0000 (+0900)
Subject: Merge "Merge some conflicts" into tizen_qemu_1.5.1
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f549f3b9323b7f91cf970e415bd4e555d516c3a2;p=sdk%2Femulator%2Fqemu.git

Merge "Merge some conflicts" into tizen_qemu_1.5.1
---

f549f3b9323b7f91cf970e415bd4e555d516c3a2