Merge branch 'tizen_2.2' into tizen

Change-Id: I745d702d4a083a733deafe8a91aef219da9fcf8e
Signed-off-by: Anas Nashif <anas.nashif@intel.com>

diff --cc alarm-lib.c
index 63d0c2e,049bff5..d2bc9ed
--- 1/alarm-lib.c
--- 2/alarm-lib.c
+++ b/alarm-lib.c
@@@ -582,7 -585,8 +584,6 @@@ static int __alarmmgr_init_appsvc(void
                return ALARMMGR_RESULT_SUCCESS;
        }
  
-       
 -      g_thread_init(NULL);
 -
        dbus_g_thread_init();
  
        ret = __sub_init();

diff --cc packaging/alarm-manager.spec
Simple merge