Merge branch 'tizen_2.2' into tizen

Conflicts:
	packaging/heynoti.spec

diff --cc heynoti.c
Simple merge

diff --cc packaging/heynoti.spec
index a3a2ceb,891f7d9..d9135ee
--- 1/packaging/heynoti.spec
--- 2/packaging/heynoti.spec
+++ b/packaging/heynoti.spec
@@@ -41,8 -37,9 +41,10 @@@ make %{?_smp_mflags
  
  %install
  %make_install
 -mkdir -p %{buildroot}/opt/share/noti
 +
 +mkdir -p %{buildroot}%{TZ_SYS_SHARE}/noti
+ mkdir -p %{buildroot}/usr/share/license
+ install LICENSE %{buildroot}/usr/share/license/%{name}
  
  %post -p /sbin/ldconfig
  
@@@ -55,7 -52,8 +57,8 @@@
  %{_libdir}/libheynoti.so.0
  %{_libdir}/libheynoti.so.0.0.2
  %{_bindir}/heynotitool
 -%attr(1755,root,root) /opt/share/noti
 +%attr(1755,root,root) %{TZ_SYS_SHARE}/noti
+ /usr/share/license/%{name}
  
  
  %files devel