Merge branch 'backport' into work

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
index dd5bb6c542f8dbe315eebb253114b9d8bcbc4647,fa8f65d323105c2e238801fd3f73313f2d8bd0a2..ec6157b276998e83c1026c290d6561ce3a01e36e
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -8,10 -8,10 +8,11 @@@ rcdir           = $(configdir)/openbo
  xsessionsdir    = $(datadir)/xsessions
  gnomewmfilesdir = $(datadir)/gnome/wm-properties
  pkgconfigdir    = $(libdir)/pkgconfig
 -pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 +obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 +rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
  pixmapdir       = $(datadir)/pixmaps
  xsddir          = $(datadir)/openbox
+ secretbindir    = $(libdir)/openbox
  
  theme = Clearlooks