Merge branch 'dev'

Conflicts:
	doc/redhat.spec

diff --cc doc/rc.d/init.d/silhouetted
Simple merge

diff --cc doc/redhat.spec
index f750917,9317fdd..b21a94a
--- 1/doc/redhat.spec
--- 2/doc/redhat.spec
+++ b/doc/redhat.spec
@@@ -116,9 -119,9 +120,10 @@@ if [ ! -e %{__datadir} ]; the
  fi
  %{__chkconfig} --add silhouetted >/dev/null 2>&1
  %{__chkconfig} silhouetted on >/dev/null 2>&1
 +#%{_initrddir}/silhouetted start >/dev/null 2>&1
  
  %postun
+ rm -f %{__bindir}/%{__prog}.py
  if [ $1 = 0 ]; then
    /usr/sbin/userdel %{_user} 2> /dev/null || :
    /usr/sbin/groupdel %{_group} 2> /dev/null || :