From: jihye kim <jihye1128.kim@samsung.com>
Date: Fri, 7 Sep 2012 06:12:40 +0000 (+0900)
Subject: Merge branch 'develop' into release
X-Git-Tag: 2.2.1_release^2~96
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c588265c00430fa39540bd01940045ed2bbc958f;p=sdk%2Femulator%2Femulator-manager.git

Merge branch 'develop' into release

Conflicts:
	package/pkginfo.manifest
---

c588265c00430fa39540bd01940045ed2bbc958f