merge r6118-6132 from trunk

diff --cc Makefile.am
index 665b52f5e5635b9fdc2f8b498a8c728808dc1256,af283aac4467fead2390e35883c1706ee07344eb..9269fb5022c09caefc4f7aa2559a495ddd27229f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -29,6 -30,15 +30,12 @@@ bin_PROGRAMS = 
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
  
 -noinst_PROGRAMS = \
 -      tools/themetoxml/themetoxml
 -
+ bin_SCRIPTS = \
+       data/xsession/openbox-gnome-session \
+       data/xsession/openbox-kde-session \
+       data/xsession/openbox-gnome \
+       data/xsession/openbox-kde
+ 
  ## render ##
  
  render_rendertest_CPPFLAGS = \
@@@ -348,10 -373,10 +355,6 @@@ nodist_rc_DATA = 
        data/rc.xml \
        data/menu.xml
  
--dist_xsd_DATA = \
--      data/rc.xsd \
--      data/menu.xsd
--
  edit = $(SED) \
        -e 's!@version\@!$(VERSION)!' \
        -e 's!@xsddir\@!$(xsddir)!'
@@@ -373,6 -405,6 +383,8 @@@ dist_xsessions_DATA = 
  
  dist_noinst_DATA = \
        version.h.in \
++      data/rc.xsd \
++      data/menu.xsd \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \

diff --cc data/themerc.xsd
Simple merge