Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 12:07:25 +0000 (21:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 25 Nov 2014 12:07:27 +0000 (21:07 +0900)
Change-Id: I75477ccc2e3771df88c889d51ff721f26d34980d

1  2 
src/slave_life.c

Simple merge