From: Dana Jansens <danakj@orodu.net>
Date: Tue, 5 Feb 2008 17:39:12 +0000 (-0500)
Subject: Merge branch 'backport' into 3.4-working
X-Git-Tag: release-3.4.6.1~1
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=48fabb02c0b51b835a451b1e49be71625adf0a30;p=mikachu%2Fopenbox.git

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

48fabb02c0b51b835a451b1e49be71625adf0a30