From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 22:31:49 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~5
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b37531d54483d88f11e11fb7dcf47d42bc937496;p=dana%2Fopenbox.git

Merge branch 'backport' into 3.4-working
---

b37531d54483d88f11e11fb7dcf47d42bc937496