Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 28 Nov 2014 09:44:00 +0000 (18:44 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 28 Nov 2014 09:44:02 +0000 (18:44 +0900)
Change-Id: I52d0454b055feca8c8c2c9d0fda307c16eda66cd

1  2 
src/slave_life.c

Simple merge