From: hudson <hudson@samsung.com>
Date: Mon, 5 Dec 2011 11:51:59 +0000 (+0900)
Subject: Merge branch 'master' into release
X-Git-Tag: 2.2.1_release^2~210
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=293458694266d5d134786c91a0419c9797422972;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'master' into release
---

293458694266d5d134786c91a0419c9797422972