From: Dana Jansens <danakj@orodu.net>
Date: Fri, 15 Feb 2008 05:56:45 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.7-pre1~14
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bcef068ce47ec62ab6a75e8d937342dfd28e5ab3;p=mikachu%2Fopenbox.git

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

bcef068ce47ec62ab6a75e8d937342dfd28e5ab3