From: hudson <hudson@samsung.com>
Date: Wed, 4 Jan 2012 10:23:26 +0000 (+0900)
Subject: Merge branch 'master' into release
X-Git-Tag: 2.2.1_release^2~192
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60013ffd999fc7eae09345c54a1d7f65e55625d0;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'master' into release
---

60013ffd999fc7eae09345c54a1d7f65e55625d0