From: Sung-jae Park <nicesj.park@samsung.com>
Date: Wed, 22 Jan 2014 00:23:10 +0000 (+0900)
Subject: Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/framework/web/livebox... 
X-Git-Tag: submit/tizen/20140430.020105~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fframework%2Fweb%2Flivebox-edje.git;a=commitdiff_plain;h=75ea1c354d19448e33d2c64b555afe1f96e79451

Merge branch 'tizen' of ssh://review.tizen.org:29418/platform/framework/web/livebox-edje into tizen

Conflicts:
	src/script_port.c

Change-Id: I86dca8dcdf8a2534691914bcfdc42f1aeebadc09
---

75ea1c354d19448e33d2c64b555afe1f96e79451