From: Jaeho Lee <jaeho81.lee@samsung.com>
Date: Wed, 20 Mar 2013 07:57:52 +0000 (+0900)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: 2.1b_release~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec5a330539509ee5360809699e0e758046f8d55f;p=framework%2Fappfw%2Falarm-manager.git

Merge branch 'master' into tizen_2.1

added a type

Conflicts:
	alarm-server.manifest
	packaging/alarm-manager.spec

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
---

ec5a330539509ee5360809699e0e758046f8d55f