merge of 6f569e40f806d552c6c14147b17fd927fb9d5718

     and f2153059b494ed4c1ea6c9bfeeedc03e774ad564

diff --cc Makefile
index 33e686c,dfd69b8..47755dc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -187,17 -191,8 +191,17 @@@ publish-master: push-maste
  
  .PHONY: upload-openslug-cross
  upload-openslug-cross: openslug/Makefile
-       rsync -avr openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/
+       rsync --omit-dir-times --delete -av --exclude="morgue" openslug/tmp/deploy/ipk/ unslung@nslu.sf.net:nslu/feeds/openslug/unstable/
  
 +.PHONY: upload-unslung-modules
 +upload-unslung-modules: unslung/Makefile
 +      scripts/package-strip.pl kernel-module-\* unslung/tmp/deploy/ipk/Packages unslung/tmp/deploy/ipk/Packages.new
 +      mv unslung/tmp/deploy/ipk/Packages.new unslung/tmp/deploy/ipk/Packages
 +      rm -f unslung/tmp/deploy/ipk/Packages.gz
 +      gzip -c unslung/tmp/deploy/ipk/Packages >unslung/tmp/deploy/ipk/Packages.gz
 +      rsync -avr unslung/tmp/deploy/ipk/kernel-module-* unslung@nslu.sf.net:nslu/feeds/unslung/oe/
 +      rsync -avr unslung/tmp/deploy/ipk/Packages* unslung@nslu.sf.net:nslu/feeds/unslung/oe/
 +
  .PHONY: import-openembedded
  import-openembedded: openembedded/conf/machine/nslu2.conf
        monotone pull monotone.vanille.de org.openembedded.*