Merge branch 'backport' into work

diff --cc .gitignore
index fa2b39043144cb05261c0a4fc8e412c49b9cc7a1,907abb9bf3c1d16e9d431825f5942b768da02675..39c864c0386f686e0d1e4d4d4008c11a038794cc
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -48,11 -48,10 +48,11 @@@ po/en@boldquot.insert-heade
  po/en@quot.insert-header
  po/remove-potcdate.sed
  *.gmo
 -render/obrender-3.0.pc
 +render/obrender-4.0.pc
 +obt/obt-4.0.pc
  tools/gnome-panel-control/gnome-panel-control
  tools/gdm-control/gdm-control
- tools/obprop/obprop
+ tools/obxprop/obxprop
  version.h
  .libs
  .deps

diff --cc Makefile.am
Simple merge

diff --cc data/rc.xml
Simple merge

diff --cc openbox/event.c
Simple merge