Merge branch 'backport' into work

diff --cc .gitignore
index 9e6bcb6b4d2d19443cdb9823bf528ad1ef4a2239,3ea0363d4e6077536d8a57d3f5581e2ba1a0f9dd..bc20413dc270d1d49dd4c765a7d8635595041f58
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -48,10 -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
  version.h
  .libs
  .deps

diff --cc Makefile.am
Simple merge

diff --cc data/rc.xml
Simple merge