Merge branch 'backport' into 3.4-working

Conflicts:

	po/no.po

diff --cc data/rc.xml
Simple merge

diff --cc data/rc.xsd
Simple merge

diff --cc openbox/config.c
Simple merge

diff --cc openbox/frame.c
Simple merge