From: jihye kim <jihye1128.kim@samsung.com>
Date: Sat, 8 Sep 2012 09:41:29 +0000 (+0900)
Subject: Merge branch 'release' into develop
X-Git-Tag: 2.2.1_release^2~83^2~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b67c3a69c5df0216c9ef6a2ebcfcb787455a73c5;p=sdk%2Femulator%2Femulator-manager.git

Merge branch 'release' into develop

Conflicts:
	package/pkginfo.manifest
---

b67c3a69c5df0216c9ef6a2ebcfcb787455a73c5