From: Sung-jae Park <nicesj.park@samsung.com>
Date: Thu, 21 Mar 2013 13:01:56 +0000 (+0000)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: accepted/tizen_2.1/20130425.023343~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97672d00067a4082d61a8806322c630037d1c44d;p=platform%2Fframework%2Fweb%2Flivebox-service.git

Merge branch 'master' into tizen_2.1

Conflicts:
	include/util.h
	packaging/liblivebox-service.spec
	src/livebox-service.c
	src/util.c

Change-Id: I77c84462bc45b95016b8af4754a1b433d607dd7d
---

97672d00067a4082d61a8806322c630037d1c44d