Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

diff --combined opencloud.spec
index 184cbf8,5b6bed4..26f67f8
--- 1/opencloud.spec
--- 2/opencloud.spec
+++ b/opencloud.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: OpenCloud core services
  Name: opencloud
 -Version: 1.0.20
 -Release: 1
 +Version: 1.0.22
 +Release: 2
  License: GPL+
  Group: Development/Tools
  Source0: %{_tmppath}/%{name}-%{version}.tar.gz
@@@ -70,12 -70,15 +70,15 @@@ f
  rm -rf %{buildroot}
  mkdir -p  %{buildroot}
  install -d %{buildroot}/opt/planetstack
+ install -d %{buildroot}/etc/init.d
  
  # in builddir
  cp -rp ./planetstack %{buildroot}/opt/.
+ cp observer-initscript %{buildroot}/etc/init.d/plstackobserver
  
  find %{buildroot}/opt/planetstack -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" > %{_tmppath}/tmp-filelist
  cp %{_tmppath}/tmp-filelist /tmp/tmp-filelist
+ echo /etc/init.d/plstackobserver > %{_tmppath}/tmp-filelist
  
  %clean
  rm -rf %{buildroot}