Merge branch 'backport' into 3.4-working

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc po/en@boldquot.po
index eeecc95a9ff741c16f84905d85faece3695bc125,c7391c6be74478897d9f133c2d1c099ca44acf6c..050a3dcb55b4a2aff65b76ad9f051b857c6709a9
--- 1/po/en@boldquot.po
--- 2/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@@ -30,10 -30,10 +30,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-02-27 21:03-0500\n"
- "PO-Revision-Date: 2008-02-27 21:03-0500\n"
+ "POT-Creation-Date: 2008-02-28 23:00+0100\n"
+ "PO-Revision-Date: 2008-02-28 23:00+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"

diff --cc po/en@quot.po
index b61fb69929a4d61b17c8850d70549e286a345c95,6aec9bc5b6feec9236c05d30dd7c99134471813f..2ee697b5f9cc6b7b69ef865f56dd35e8d2f8d8d3
--- 1/po/en@quot.po
--- 2/po/en@quot.po
+++ b/po/en@quot.po
@@@ -27,10 -27,10 +27,10 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: openbox 3.999.0\n"
 +"Project-Id-Version: openbox 3.4.7-pre1\n"
  "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
- "POT-Creation-Date: 2008-02-27 21:03-0500\n"
- "PO-Revision-Date: 2008-02-27 21:03-0500\n"
+ "POT-Creation-Date: 2008-02-28 23:00+0100\n"
+ "PO-Revision-Date: 2008-02-28 23:00+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"