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

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

2d0fa91f5232cb76d30ecb54b68595fdf481746a