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

Merge branch 'master' into tizen_2.1

Conflicts:
	packaging/liblivebox.spec
	src/livebox.c

Change-Id: Ia4cccebd50b8613537af419233052d04f91f98d7
---

378bf1ed41dffce2f73dded4b8d84057a24900cf