From: Kitae Kim <kt920.kim@samsung.com>
Date: Tue, 23 Oct 2012 12:14:33 +0000 (+0900)
Subject: Merge branch 'develop' into release
X-Git-Tag: 2.2.1_release^2~88
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86bfcd5259889f432a60a5a7890c36028a45c65a;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop' into release

Conflicts:
	drivers/maru/maru_camera.c
	package/pkginfo.manifest
---

86bfcd5259889f432a60a5a7890c36028a45c65a