From: Dana Jansens <danakj@orodu.net>
Date: Sun, 2 Mar 2008 09:16:41 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre2~7
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b137c4e8c744c4f05cdc34e69adb8e650059cc4c;p=mikachu%2Fopenbox.git

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

b137c4e8c744c4f05cdc34e69adb8e650059cc4c