Merge branch 'backport' into 3.4

diff --cc openbox/session.c
Simple merge

diff --cc po/en@boldquot.po
index dade8521ab7613a3b70f4e818efc29520725cb04,c384063c6a8eaa21a8e273e644eac6316cd56d9e..973e167c3d7ac1472b6ffaeed2bf117fe3087e34
--- 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-03-02 18:34-0500\n"
- "PO-Revision-Date: 2008-03-02 18:34-0500\n"
+ "POT-Creation-Date: 2008-03-03 02:10+0100\n"
+ "PO-Revision-Date: 2008-03-03 02:10+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"

diff --cc po/en@quot.po
index b702f8cb2b48e74caf536cbf6375f90a3970c9b2,0241f8322f6eee442266287eafdbb0a74d03c44c..2c6fab8135a770ec38f6f0a8dfbb8dd718b83256
--- 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-03-02 18:34-0500\n"
- "PO-Revision-Date: 2008-03-02 18:34-0500\n"
+ "POT-Creation-Date: 2008-03-03 02:10+0100\n"
+ "PO-Revision-Date: 2008-03-03 02:10+0100\n"
  "Last-Translator: Automatically generated\n"
  "Language-Team: none\n"
  "MIME-Version: 1.0\n"