From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 2 Mar 2008 16:25:13 +0000 (+0100)
Subject: Merge branch 'backport' into 3.4
X-Git-Tag: release-3.4.7-pre2~8
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=89d433860ce95fe195efa7b56bb740e056728b61;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4

Conflicts (these changes don't apply at all to 3.4, so ignored them):

	openbox/actions/desktop.c
	openbox/actions/if.c
---

89d433860ce95fe195efa7b56bb740e056728b61