Merge branch 'backport' into 3.4-working

Conflicts:

	configure.ac

diff --cc configure.ac
index e69d028b64e27faf0b01a7925c2780fb332a8fcc,eb11c03f8b97900f9f2d14637174eb0a3ca3c32f..ed7a449823560bda49671a54763e76932b3aca66
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -15,10 -15,10 +15,10 @@@ dnl if MAJOR or MINOR version changes, 
  dnl
  OB_MAJOR_VERSION=3
  OB_MINOR_VERSION=4
 -OB_MICRO_VERSION=16
 -OB_INTERFACE_AGE=0
 -OB_BINARY_AGE=0
 +OB_MICRO_VERSION=27
 +OB_INTERFACE_AGE=6
 +OB_BINARY_AGE=6
- OB_VERSION=$OB_MAJOR_VERSION.$OB_MINOR_VERSION
+ OB_VERSION=$PACKAGE_VERSION
  
  AC_SUBST(OB_MAJOR_VERSION)
  AC_SUBST(OB_MINOR_VERSION)

diff --cc data/rc.xml
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/prop.h
Simple merge