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

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

acc85f7d604a791760df3c9e67d0d6ed427764ea