Merge branch 'master' into tizen_2.1

Conflicts:
	packaging/emuld.spec
	src/emuld.c

diff --cc packaging/emuld.spec
index b6dff2a3186cb81ac7cd3b40139b5ae2f2373741,2e8b6fd431ed99ce226d4509d1208827cbfddbad..4547b8b2b0161150f4043430689bed8b5387acb6
--- 1/packaging/emuld.spec
--- 2/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@@ -23,6 -23,13 +23,12 @@@ mak
  
  %install
  rm -rf %{buildroot}
 -
+ if [ ! -d %{buildroot}/usr/lib/systemd/system/multi-user.target.wants ]; then
+     mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+ fi
+ cp emuld.service %{buildroot}/usr/lib/systemd/system/.
+ ln -s ../emuld.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/emuld.service
+ 
  %make_install
  
  %clean