From: jihye kim <jihye1128.kim@samsung.com>
Date: Fri, 18 Jan 2013 08:58:22 +0000 (+0900)
Subject: Merge branch 'develop' into release
X-Git-Tag: 2.2.1_release^2~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f5964402e856d0ef1db0cf97069d29750c4f62;p=sdk%2Femulator%2Femulator-manager.git

Merge branch 'develop' into release

Conflicts:
	VERSION
	package/changelog
	package/pkginfo.manifest
---

e5f5964402e856d0ef1db0cf97069d29750c4f62