From: Sung-jae Park <nicesj.park@samsung.com>
Date: Thu, 21 Mar 2013 13:04:21 +0000 (+0000)
Subject: Merge branch 'master' into tizen_2.1
X-Git-Tag: 2.1b_release~12
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fframework%2Fweb%2Flivebox-viewer.git;a=commitdiff_plain;h=493983049307c5b59afd0062b1eec5559882a131

Merge branch 'master' into tizen_2.1

Conflicts:
	include/livebox.h
	packaging/liblivebox-viewer.spec
	src/client.c
	src/livebox.c

Change-Id: I050dcac2812c1c85d7a12e3589304b02d78dad66
---

493983049307c5b59afd0062b1eec5559882a131