From: Dana Jansens <danakj@orodu.net>
Date: Fri, 22 Feb 2008 17:13:13 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre1~9
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bd442246fb5bf82e232b71f0bd4ee1667125340a;p=dana%2Fopenbox.git

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

bd442246fb5bf82e232b71f0bd4ee1667125340a