From: Dana Jansens <danakj@orodu.net>
Date: Tue, 19 Feb 2008 01:52:06 +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=ac76b3430a2ee4fc3bf78a699bbd40658911f505;p=mikachu%2Fopenbox.git

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

ac76b3430a2ee4fc3bf78a699bbd40658911f505