Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 5 Dec 2014 12:07:47 +0000 (21:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 5 Dec 2014 12:07:49 +0000 (21:07 +0900)
Change-Id: I791e20ee7c254acfc975578e70bd7a2796c0eecd

1  2 
src/slave_life.c

Simple merge