From: hudson <hudson@samsung.com>
Date: Sat, 24 Dec 2011 07:44:10 +0000 (+0900)
Subject: Merge branch 'master' into release
X-Git-Tag: 2.2.1_release^2~197
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=42d3460de1ee5a0a894a3469972f8b33dfad1115;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'master' into release
---

42d3460de1ee5a0a894a3469972f8b33dfad1115