Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 8 Dec 2014 04:07:03 +0000 (13:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 8 Dec 2014 04:07:07 +0000 (13:07 +0900)
Change-Id: Ifd7ad26656afaf26ee7832cdc8b871e568afeaaa

1  2 
src/slave_life.c

Simple merge