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

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

fe2b142275751b5163fe004b1834c3d28a1a5224