From: hudson <hudson@samsung.com>
Date: Thu, 12 Jan 2012 07:20:07 +0000 (+0900)
Subject: Merge branch 'develop' into release
X-Git-Tag: 2.2.1_release^2~190
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e96589ca9c2fb175ba68cbe7f4e831029bddfee8;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop' into release
---

e96589ca9c2fb175ba68cbe7f4e831029bddfee8