merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:13 +0000 (01:12 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:13 +0000 (01:12 +0900)
commit3169896c0735e75ca9832712657e884238f96879
treebdb3751e4f18a451b9ae6b53db8e7b93239e8dbc
parent4de8c996044c5e44978c9429d6321101bc3ceec8
merge with master
CMakeLists.txt
packaging/capi-system-system-settings.spec