Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox into tizen_2.3
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 17 Nov 2014 05:04:33 +0000 (14:04 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 17 Nov 2014 05:04:33 +0000 (14:04 +0900)

Trivial merge