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

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

aea7dd9c1afc1322788969ad5c5811dbea926442