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

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

87ceac57c96556333727d64653e3e3891bad5ba8