From: Dana Jansens <danakj@orodu.net>
Date: Sun, 15 Jul 2007 16:56:13 +0000 (-0400)
Subject: Merge branch 'master' into 3.4
X-Git-Tag: release-3.4.3~33
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=88254b8eadb2e760e3df86813f93df834035bde8;p=dana%2Fopenbox.git

Merge branch 'master' into 3.4

Conflicts:

	openbox/actions/desktop.c
---

88254b8eadb2e760e3df86813f93df834035bde8