merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:25 +0000 (01:12 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:25 +0000 (01:12 +0900)
commit58ab92967fb7d55e23e6df229475f536c097b008
tree23ac3a5afc29f9c2995d3b0a3ea7fff2f1996cb9
parent26c5a1401e06a795d432f5aa66f89ac5e8f8362e
merge with master
alarm-manager.c
packaging/alarm-manager.spec