Merge branch 'backport' into 3.4-working

diff --combined Makefile.am
index c1599c5,0b7e587..c0822f8
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -172,6 -172,7 +172,6 @@@ openbox_openbox_SOURCES = 
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
        openbox/actions/iconify.c \
 -      openbox/actions/if.c \
        openbox/actions/kill.c \
        openbox/actions/layer.c \
        openbox/actions/lower.c \
@@@ -188,7 -189,6 +188,7 @@@
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
        openbox/actions/shade.c \
 +      openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.c \
@@@ -405,8 -405,10 +405,10 @@@ nodist_pkgconfig_DATA = 
  dist_pixmap_DATA = \
        data/openbox.png
  
+ nodist_rc_DATA = \
+       data/autostart.sh
+ 
  dist_rc_DATA = \
-       data/autostart.sh \
        data/rc.xml \
        data/menu.xml
  
@@@ -446,6 -448,7 +448,7 @@@ nodist_xsessions_DATA = 
  
  dist_noinst_DATA = \
        version.h.in \
+       data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \