Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox...
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 10:29:02 +0000 (19:29 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 10:29:02 +0000 (19:29 +0900)

Trivial merge