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

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

9565fc616b9a031bcfbe74ffc33aa602a4f9b258