From: Dana Jansens <danakj@orodu.net>
Date: Thu, 21 Feb 2008 18:24:29 +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=b42618b8d9b65b3f40200ffbe628c3f86056faeb;p=mikachu%2Fopenbox.git

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

b42618b8d9b65b3f40200ffbe628c3f86056faeb