Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox into tizen_2.3
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 29 Dec 2014 03:01:52 +0000 (12:01 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 29 Dec 2014 03:01:52 +0000 (12:01 +0900)

Trivial merge