Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Fri, 29 Mar 2013 02:14:51 +0000 (11:14 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Fri, 29 Mar 2013 02:14:51 +0000 (11:14 +0900)
commitc3c38058a53994488f8f5f961643d33bc64d5d17
tree2540a52cae559be3315c8374fb3c869164c4a72a
parentec5a330539509ee5360809699e0e758046f8d55f
parenta671a0b0daba404ebf880858c802fa68e2a8fa52
Merge branch 'master' into tizen_2.1

added a type

Conflicts:
packaging/alarm-manager.spec

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